philorg/my-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add curl in ci image: adjust the registry name to the public instance

Browse source
This commit is contained in:
phil 2024-12-27 05:34:29 +01:00
parent e65b334271
commit 65b2f9c0a8
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Containerfile.ci
View file

@ -1,7 +1,7 @@
# Build: podman build -t localhost/python-ci -f Containerfile.ci # Build: podman build -t code.philo.ydns.eu/philorg/python-ci -f Containerfile.ci
FROM localhost/trixie_python FROM code.philo.ydns.eu/philorg/trixie_python:latest
RUN apt-get -y --no-install-recommends install nodejs git python3-pytest python3-httpx buildah podman && \ RUN apt-get -y --no-install-recommends install nodejs git python3-pytest python3-httpx buildah podman curl && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/listsd/* && \ rm -rf /var/lib/apt/listsd/* && \
rm -rf /root/.cache rm -rf /root/.cache

16
Containerfile.trixie_python
View file

@ -1,6 +1,6 @@
# Build: podman build -t trixie_python -f Containerfile.trixie_python # Build: podman build -t code.philo.ydns.eu/philorg/trixie_python -f Containerfile.trixie_python
FROM debian:trixie-slim FROM docker.io/debian:trixie-slim
RUN <<EOT RUN <<EOT
apt-get update -qy apt-get update -qy
@ -15,9 +15,9 @@ EOT
COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
ENV UV_LINK_MODE=copy \ ENV UV_LINK_MODE=copy \
UV_COMPILE_BYTECODE=1 \ UV_COMPILE_BYTECODE=1 \
UV_PYTHON_DOWNLOADS=never \ UV_PYTHON_DOWNLOADS=never \
#UV_PYTHON=python3.12 \ #UV_PYTHON=python3.12 \
UV_PROJECT_ENVIRONMENT=/app \ UV_PROJECT_ENVIRONMENT=/app \
PYTHONPATH=/app/lib/python3.12/site-packages \ PYTHONPATH=/app/lib/python3.12/site-packages \
PATH=/app/bin:$PATH PATH=/app/bin:$PATH

9
build_generic_images.yaml
View file

@ -5,14 +5,15 @@
force: false force: false
force_rm: false force_rm: false
cache: false cache: false
registry: tiptop:5000 registry: code.philo.ydns.eu
organisation: philorg
tasks: tasks:
- name: Using the variables - name: Using the variables
ansible.builtin.debug: ansible.builtin.debug:
var: force_rm var: force_rm
- name: Build the base image - name: Build the base image (trixie_python)
containers.podman.podman_image: containers.podman.podman_image:
name: trixie_python name: trixie_python
state: build state: build
@ -25,7 +26,7 @@
file: Containerfile.trixie_python file: Containerfile.trixie_python
push: true push: true
push_args: push_args:
dest: "{{ registry }}/trixie_python" dest: "{{ registry }}/{{ organisation }}/trixie_python"
- name: Build the image for ci - name: Build the image for ci
containers.podman.podman_image: containers.podman.podman_image:
@ -40,4 +41,4 @@
file: Containerfile.ci file: Containerfile.ci
push: true push: true
push_args: push_args:
dest: "{{ registry }}/python-ci" dest: "{{ registry }}/{{ organisation }}/python-ci"