Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .devcontainer/dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ services:
USER_GID: 1000
WORK_DIR: "/workspace"
UV: ${UV_INSTALL_DIR}
PNPM: ${PNPM_BIN}
SSH_AUTH_SOCK: /ssh-agent
BIN_DEPLOY_PREP: ${BIN_DEPLOY_PREP}
BIN_DEPLOY_REQ: ${BIN_DEPLOY_REQ}
BIN_DEPLOY_HEALTH: ${BIN_DEPLOY_HEALTH}
BIN_DEPLOY_ENTRY_DEV: ${BIN_DEPLOY_ENTRY_DEV}
volumes:
- ${SSH_AUTH_SOCK:-/dev/null}:/ssh-agent:ro
- .:/workspace:cached
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ SPDX-FileCopyrightText: 2026 Artur Lissin
SPDX-License-Identifier: CC0-1.0
-->

## v0.9.4 (2026-07-10)

### Refactor

- correct docker production deployment

## v0.9.3 (2026-07-07)

### Fix
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ ARG USERNAME=runner
ARG USER_UID=1001
ARG USER_GID=${USER_UID}
ARG HOME_MAIN="/home/${USERNAME}"
ARG BIN_DEPLOY_ENTRY_PROD
ARG BIN_DEPLOY_HEALTH

RUN dnf clean all && dnf install -y bash

Expand All @@ -48,8 +50,8 @@ COPY ./${BIN_DEPLOY_PREP} /prep.sh
COPY ./${BIN_DEPLOY_REQ} /req.sh

COPY --from=appbuilder /tmp/app/dist /tmp/build
COPY --from=appbuilder /health.sh /health.sh
COPY --from=appbuilder /entry.sh /entry.sh
COPY ./${BIN_DEPLOY_ENTRY_PROD} /entry.sh
COPY ./${BIN_DEPLOY_HEALTH} /health.sh

WORKDIR /tmp/build
RUN bash /prep.sh && rm /prep.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: CC0-1.0

### A Bare-Bone Python Monorepo Template

[![release: 0.9.3](https://img.shields.io/badge/rel-0.9.3-blue.svg?style=flat-square)](https://github.com/artdotlis/INITpy)
[![release: 0.9.4](https://img.shields.io/badge/rel-0.9.4-blue.svg?style=flat-square)](https://github.com/artdotlis/INITpy)
[![The Unlicense](https://img.shields.io/badge/License-Unlicense-brightgreen.svg?style=flat-square)](https://choosealicense.com/licenses/unlicense/)
[![Documentation Status](https://img.shields.io/badge/docs-GitHub-blue.svg?style=flat-square)](https://artdotlis.github.io/INITpy/)

Expand Down
1 change: 1 addition & 0 deletions bin/deploy/entry_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
# SPDX-License-Identifier: Unlicense
set -euo pipefail

echo 'DEV'
sleep infinity
1 change: 1 addition & 0 deletions bin/deploy/entry_prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
# SPDX-License-Identifier: Unlicense
set -euo pipefail

echo 'PROD'
sleep infinity
8 changes: 0 additions & 8 deletions bin/deploy/prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# SPDX-License-Identifier: Unlicense
set -euo pipefail

root_path=$(dirname "$(realpath "$0")")
source "$root_path/../../package.env"

echo "prep setup"
dnf clean all && rm -rf /var/cache/dnf
update-ca-trust extract
Expand All @@ -16,9 +13,4 @@ dnf -y install epel-release
dnf -y install dnf-plugins-core
dnf config-manager --set-enabled crb
dnf upgrade --refresh -y
echo -e "copy health"
cp "$root_path/health.sh" / && chmod +x /health.sh
echo -e "copy entrypoint"
cp "$root_path/entry_dev.sh" /entry_dev.sh && chmod +x /entry_dev.sh
cp "$root_path/entry_prod.sh" /entry.sh && chmod +x /entry.sh
echo "prep finished"
8 changes: 7 additions & 1 deletion configs/docker/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
FROM docker.io/almalinux:10

ARG UV
ARG PNPM
ARG USERNAME=devu
ARG USER_UID=1000
ARG USER_GID=$USER_UID
ARG WORK_DIR=/workspace
ENV HOME_MAIN="/home/${USERNAME}"
ENV PATH="${HOME_MAIN}/.local/bin:${WORK_DIR}/${UV}:${PATH}"
ENV PATH="${HOME_MAIN}/.local/bin:${WORK_DIR}/${UV}:${WORK_DIR}/${PNPM}:${PATH}"
ENV CONTAINER="container"
ENV HISTFILE=/dev/null
ENV HISTSIZE=0
ENV HISTFILESIZE=0

ARG BIN_DEPLOY_PREP
ARG BIN_DEPLOY_REQ
ARG BIN_DEPLOY_ENTRY_DEV
ARG BIN_DEPLOY_HEALTH

RUN groupadd --gid $USER_GID $USERNAME \
&& useradd -m -d $HOME_MAIN \
Expand All @@ -23,6 +26,9 @@ COPY . /tmp/app

WORKDIR /tmp/app

COPY ./${BIN_DEPLOY_ENTRY_DEV} /entry_dev.sh
COPY ./${BIN_DEPLOY_HEALTH} /health.sh

RUN dnf clean all && dnf install -y bash
RUN bash "./${BIN_DEPLOY_PREP}" && bash "./${BIN_DEPLOY_REQ}"

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ services:
WORK_DIR: "/workspace"
BIN_DEPLOY_PREP: ${BIN_DEPLOY_PREP}
BIN_DEPLOY_REQ: ${BIN_DEPLOY_REQ}
BIN_DEPLOY_HEALTH: ${BIN_DEPLOY_HEALTH}
BIN_DEPLOY_ENTRY_PROD: ${BIN_DEPLOY_ENTRY_PROD}

secrets:
env_file:
Expand Down
5 changes: 5 additions & 0 deletions package.env
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ UV_LINK_MODE=copy
UV_PYTHON_INSTALL_DIR=.uv/python

PNPM_HOME=.pnpm
PNPM_BIN=.pnpm/bin

UV_VERSION=0.11.26
PNPM_VERSION=11.9.0
Expand All @@ -34,4 +35,8 @@ DOCS_ENV=packages/docs/.env
BIN_DEPLOY_PREP=bin/deploy/prep.sh
BIN_DEPLOY_REQ=bin/deploy/req.sh

BIN_DEPLOY_HEALTH=bin/deploy/health.sh
BIN_DEPLOY_ENTRY_DEV=bin/deploy/entry_dev.sh
BIN_DEPLOY_ENTRY_PROD=bin/deploy/entry_prod.sh

DOC_PORT=9191
2 changes: 1 addition & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"scripts": {
"build": "pnpm list --depth 0 --parseable --lockfile-only | grep node_modules | xargs -I {} find {} -type f -name '*.min.js' | xargs -I {} cp {} \"$EXTRA_JS\""
},
"version": "0.9.3"
"version": "0.9.4"
}
2 changes: 1 addition & 1 deletion packages/pkg1/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[project]
classifiers = ["Private :: Do Not Upload"]
name = "pkg1"
version = "0.9.3"
version = "0.9.4"
description = "One of the projects in the monorepo."
readme = "README.md"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion packages/shared_utils/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[project]
classifiers = ["Private :: Do Not Upload"]
name = "shared_utils"
version = "0.9.3"
version = "0.9.4"
description = "Shared library for packages."
readme = "README.md"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[project]
classifiers = ["Private :: Do Not Upload"]
name = "initpy"
version = "0.9.3"
version = "0.9.4"
description = """Initial bare-bone monorepo Python project."""
readme = "README.md"
authors = [{ name = "Artur Lissin", email = "artdotlis@pm.me" }]
Expand Down
6 changes: 3 additions & 3 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading