Commit c3bd3999 authored by nimrod's avatar nimrod
Browse files

A few updates. 

- Update the base image for most images.
- Remove the Cloudposse repo for the k8s image. All of the tools are now
  available in the Alpine repos.
- Use the toolbx image as the base image for the python3 image.
- Use the python3 image as the base for the pre-commit image.
parent a789a5e9

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ push-k8s: 
# pre-commit image:



build-pre-commit:

  needs:

    - push-python3

  extends: .container-build

  variables:

    CONTEXT: images/pre-commit

images/bats/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM registry.hub.docker.com/library/alpine:3.18

FROM registry.hub.docker.com/library/alpine:3.21

# hadolint ignore=DL3018

RUN apk add --update --no-cache \

        bats \

images/docker/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM docker.io/docker:24.0-cli

FROM docker.io/docker:28.0-cli

# hadolint ignore=DL3018

RUN apk add --update-cache --no-cache \

        buildah \

images/hugo/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM registry.hub.docker.com/library/alpine:3.18

FROM registry.hub.docker.com/library/alpine:3.21

# hadolint ignore=DL3018

RUN apk add --no-cache --update hugo && \

    hugo version

images/k8s/Dockerfile

+2 −3
Original line number Diff line number Diff line 
FROM docker.io/library/alpine:3.18

FROM docker.io/library/alpine:3.21

# hadolint ignore=DL3018

RUN wget -q https://apk.cloudposse.com/ops@cloudposse.com.rsa.pub -O /etc/apk/keys/ops@cloudposse.com.rsa.pub && \

    echo "https://apk.cloudposse.com/3.15/vendor" >> /etc/apk/repositories && \

RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.21/community' >> /etc/apk/repositories && \

    apk add --update --no-cache \

        docker-cli \

        helm \