Skip to content

Commit

Permalink
python: switch base image to bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewpi committed Oct 17, 2023
1 parent 2e03966 commit 7693736
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
8 changes: 5 additions & 3 deletions python/3.10/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,21 @@
# SOFTWARE.
#

FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.10-alpine
FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.10-bookworm

LABEL author="Matthew Penner" maintainer="[email protected]"

LABEL org.opencontainers.image.source="https://github.com/matthewpi/images"
LABEL org.opencontainers.image.licenses=MIT

RUN apk add --update --no-cache ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
&& adduser -D -h /home/container container

USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container

COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD [ "/bin/bash", "/entrypoint.sh" ]
8 changes: 5 additions & 3 deletions python/3.11/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,21 @@
# SOFTWARE.
#

FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.11-alpine
FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.11-bookworm

LABEL author="Matthew Penner" maintainer="[email protected]"

LABEL org.opencontainers.image.source="https://github.com/matthewpi/images"
LABEL org.opencontainers.image.licenses=MIT

RUN apk add --update --no-cache ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
&& adduser -D -h /home/container container

USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container

COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD [ "/bin/bash", "/entrypoint.sh" ]
8 changes: 5 additions & 3 deletions python/3.12/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,21 @@
# SOFTWARE.
#

FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.12-alpine
FROM --platform=$TARGETOS/$TARGETARCH docker.io/library/python:3.12-bookworm

LABEL author="Matthew Penner" maintainer="[email protected]"

LABEL org.opencontainers.image.source="https://github.com/matthewpi/images"
LABEL org.opencontainers.image.licenses=MIT

RUN apk add --update --no-cache ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update -y && apt-get upgrade -y && apt-get install -y ca-certificates curl ffmpeg g++ gcc git iproute2 openssl sqlite tar tzdata \
&& adduser -D -h /home/container container

USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container

COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD [ "/bin/bash", "/entrypoint.sh" ]
2 changes: 1 addition & 1 deletion python/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/ash
#!/bin/bash

#
# Copyright (c) 2023 Matthew Penner
Expand Down

0 comments on commit 7693736

Please sign in to comment.