Container build: simplify & speed up, removing the final step running the app as a dedicated user
This commit is contained in:
parent
ae0d3532aa
commit
0f612ae3cc
3 changed files with 13 additions and 47 deletions
|
@ -1,26 +1,23 @@
|
||||||
FROM localhost/treetrail-backend-base
|
# Build: podman build -t treetrail-backend-base -f Containerfile.base
|
||||||
|
|
||||||
RUN <<EOT
|
FROM localhost/treetrail-backend-deps
|
||||||
groupadd -r app
|
|
||||||
useradd -r -d /app -g app -N app
|
|
||||||
mkdir /var/lib/treetrail
|
|
||||||
chown app: /var/lib/treetrail
|
|
||||||
EOT
|
|
||||||
|
|
||||||
COPY --from=localhost/treetrail-backend-base --chown=app:app /app /app
|
ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
|
||||||
|
|
||||||
USER app
|
COPY . /src
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Instances should override the prod.yaml file
|
#RUN --mount=type=cache,target=/root/.cache \
|
||||||
#COPY ./prod.yaml /etc/treetrail/prod.yaml
|
# cd /src && \
|
||||||
#COPY ./dist/treetrail_backend-0.3.0.tar.gz /src/
|
# uv sync --locked --no-dev --no-editable
|
||||||
|
|
||||||
#RUN uv pip install /src/treetrail_backend-0.3.0.tar.gz
|
RUN uv pip install \
|
||||||
|
--python=$UV_PROJECT_ENVIRONMENT \
|
||||||
|
--no-deps \
|
||||||
|
/src
|
||||||
|
|
||||||
CMD [ \
|
CMD [ \
|
||||||
"uvicorn", "treetrail.application:app", \
|
"uvicorn", "treetrail.application:app", \
|
||||||
"--port", "8081", \
|
"--port", "8081", \
|
||||||
#"--log-config", "/app/config/logging.yaml", \
|
#"--log-config", "/app/config/logging.yaml", \
|
||||||
"--host", "0.0.0.0" \
|
"--host", "0.0.0.0" \
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
# Build: podman build -t treetrail-backend-base -f Containerfile.base
|
|
||||||
|
|
||||||
FROM localhost/treetrail-backend-deps
|
|
||||||
|
|
||||||
ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
|
|
||||||
|
|
||||||
COPY . /src
|
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/root/.cache \
|
|
||||||
cd /src && \
|
|
||||||
uv sync --locked --no-dev --no-editable
|
|
||||||
|
|
||||||
#uv pip install \
|
|
||||||
# --python=$UV_PROJECT_ENVIRONMENT \
|
|
||||||
# --no-deps \
|
|
||||||
# /src
|
|
17
build.yaml
17
build.yaml
|
@ -31,22 +31,7 @@
|
||||||
push_args:
|
push_args:
|
||||||
dest: "{{ repository }}/treetrail-backend-deps"
|
dest: "{{ repository }}/treetrail-backend-deps"
|
||||||
|
|
||||||
- name: Build a backend base container image, with sources in /src
|
- name: Build the backend base container image
|
||||||
containers.podman.podman_image:
|
|
||||||
name: treetrail-backend-base
|
|
||||||
state: build
|
|
||||||
force: true
|
|
||||||
path: "{{ playbook_dir }}"
|
|
||||||
build:
|
|
||||||
format: oci
|
|
||||||
force_rm: "{{ force_rm }}"
|
|
||||||
cache: "{{ cache }}"
|
|
||||||
file: Containerfile.base
|
|
||||||
push: true
|
|
||||||
push_args:
|
|
||||||
dest: "{{ repository }}/treetrail-backend-base"
|
|
||||||
|
|
||||||
- name: Build the prod container image
|
|
||||||
containers.podman.podman_image:
|
containers.podman.podman_image:
|
||||||
name: treetrail-backend
|
name: treetrail-backend
|
||||||
state: build
|
state: build
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue