Update images

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
       - litespeed-v*
       - ansible-almalinux-v*
       - ansible-rockylinux-v*
+      - ansible-ubuntu-v*
       - tfaws-v*
       - tfgcp-v*
       - nginx-v*
@@ -35,7 +36,9 @@ jobs:
 
       - name: Get the version
         id: get_version
-        run: echo VERSION=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $2}') >> $GITHUB_ENV
+        run: |
+          VERSION=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $2}')
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: "[ghcr.io/${{ env.REPO_OWNER }}/squid-lxc] Push image to GitHub Container Registry"
         if: contains(github.ref, 'tags/squid-v')
@@ -76,6 +79,19 @@ jobs:
           provenance: false
           tags: ghcr.io/${{ env.REPO_OWNER }}/ansible-almalinux:latest,ghcr.io/${{ env.REPO_OWNER }}/ansible-almalinux:${{ env.VERSION }}
 
+      - name: "[ghcr.io/${{ env.REPO_OWNER }}/ansible-ubuntu] Push image to GitHub Container Registry"
+        if: contains(github.ref, 'tags/ansible-ubuntu-v')
+        uses: docker/build-push-action@v5
+        env:
+          DOCKER_CONTENT_TRUST: 1
+          BUILDKIT_MULTI_PLATFORM: 1
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: ./ansible/almalinux
+          push: true
+          provenance: false
+          tags: ghcr.io/${{ env.REPO_OWNER }}/ansible-ubuntu:latest,ghcr.io/${{ env.REPO_OWNER }}/ansible-ubuntu:${{ env.VERSION }}
+
       - name: "[ghcr.io/[${{ env.REPO_OWNER }}/airflow2] Push image to GitHub Container Registry"
         if: contains(github.ref, 'tags/airflow2-v')
         uses: docker/build-push-action@v5

.gitignore

@@ -1 +1,3 @@
 proxy/squid/squid.conf
+proxy/squid/logs/*
+!proxy/squid/logs/.gitkeep

README.md

@@ -6,13 +6,14 @@
 ### Ansible(systemd)
 * [AlmaLinux OS (amd64 & aarch64)](/ansible/almalinux/) - [ghcr.io/tier940/ansible-almalinux:latest](https://github.com/tier940/docker-repo/pkgs/container/ansible-almalinux)
 * [Rocky Linux (amd64 & aarch64)](/ansible/rockylinux/) - [ghcr.io/tier940/ansible-rockylinux:latest](https://github.com/tier940/docker-repo/pkgs/container/ansible-rockylinux)
+* [Ubuntu 24.04 LTS (amd64 & aarch64)](/ansible/ubuntu/) - [ghcr.io/tier940/ansible-ubuntu:latest](https://github.com/tier940/docker-repo/pkgs/container/ansible-ubuntu)
 
 ### Terrafrom
 * [AWS(amd64 & aarch64)](/terraform/aws/) - [ghcr.io/tier940/terraform-aws:latest](https://github.com/tier940/docker-repo/pkgs/container/terraform-aws)
 * [GCP(amd64 & aarch64)](/terraform/gcp/) - [ghcr.io/tier940/terraform-gcp:latest](https://github.com/tier940/docker-repo/pkgs/container/terraform-gcp)
 
 ### Web
-* [Airflow 2.8.0(amd64 & aarch64)](/web/airflow/) - [ghcr.io/tier940/airflow2:latest](https://github.com/tier940/docker-repo/pkgs/container/airflow2)
+* [Airflow 2.8.1(amd64 & aarch64)](/web/airflow/) - [ghcr.io/tier940/airflow2:latest](https://github.com/tier940/docker-repo/pkgs/container/airflow2)
 * [LiteSpeed(amd64 & aarch64)](/web/litespeed/) - [ghcr.io/tier940/litespeed:latest](https://github.com/tier940/docker-repo/pkgs/container/litespeed)
 * [Nginx](/web/nginx/) - [ghcr.io/tier940/nginx:latest](https://github.com/tier940/docker-repo/pkgs/container/nginx)
 * [PHP 8.0](/web/php/8.0/) - [ghcr.io/tier940/php80:latest](https://github.com/tier940/docker-repo/pkgs/container/php80)

ansible/almalinux/Dockerfile

@@ -19,5 +19,5 @@ RUN [ ! -f /usr/sbin/init ] \
         rm -f /lib/systemd/system/anaconda.target.wants/*;
 
 WORKDIR /root/work
-VOLUME [ "/sys/fs/cgroup" ]
+VOLUME ["/sys/fs/cgroup"]
 CMD ["/usr/sbin/init"]

ansible/almalinux/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 services:
   almalinux:
     build:

ansible/rockylinux/Dockerfile

@@ -19,5 +19,5 @@ RUN [ ! -f /usr/sbin/init ] \
         rm -f /lib/systemd/system/anaconda.target.wants/*;
 
 WORKDIR /root/work
-VOLUME [ "/sys/fs/cgroup" ]
+VOLUME ["/sys/fs/cgroup"]
 CMD ["/usr/sbin/init"]

ansible/rockylinux/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 services:
   rockylinux:
     build:

ansible/ubuntu/.env

@@ -0,0 +1,2 @@
+COMPOSE_PROJECT_NAME=ansible
+COMPOSE_CONVERT_WINDOWS_PATHS=true

ansible/ubuntu/Dockerfile

@@ -0,0 +1,26 @@
+FROM --platform=$BUILDPLATFORM docker.io/ubuntu:24.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG TARGETOS TARGETARCH
+ENV container docker
+LABEL maintainer="tier940"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \ 
+        software-properties-common gpg-agent systemd systemd-cron \
+    && apt-add-repository --yes --update ppa:ansible/ansible \
+    && apt-get install -y --no-install-recommends ansible \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+        rm -f /lib/systemd/system/multi-user.target.wants/*; \
+        rm -f /etc/systemd/system/*.wants/*; \
+        rm -f /lib/systemd/system/local-fs.target.wants/*; \
+        rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+        rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+        rm -f /lib/systemd/system/basic.target.wants/*; \
+        rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+WORKDIR /root/work
+VOLUME ["/tmp", "/run", "/run/lock"]
+CMD ["/lib/systemd/systemd"]

ansible/ubuntu/docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3.9"
+services:
+  ubuntu:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    privileged: true
+    container_name: ubuntu
+    tty: true
+    volumes:
+      - ./work:/root/work

ansible/ubuntu/work/playbook.yml

@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  become : true
+  tasks:
+    - name: cat /etc/os-release
+      shell: cat /etc/os-release
+      register: os_release

proxy/squid/Dockerfile

@@ -26,5 +26,6 @@ COPY lxc-whitelist /etc/squid/whitelist
 # Finalize
 EXPOSE 3128
 USER squid
+WORKDIR /etc/squid/
 ENTRYPOINT [ "/usr/sbin/squid" ]
 CMD [ "-N", "-f", "/etc/squid/squid.conf" ]

proxy/squid/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 services:
   lxc:
     build:
@@ -15,3 +15,4 @@ services:
     volumes:
       - ./squid.conf:/etc/squid/squid.conf
       - ./lxc-whitelist:/etc/squid/whitelist
+      - ./logs:/var/log/squid

terraform/aws/Dockerfile

@@ -1,13 +1,13 @@
-FROM --platform=$BUILDPLATFORM public.ecr.aws/aws-cli/aws-cli:2.15.9
+FROM --platform=$BUILDPLATFORM public.ecr.aws/aws-cli/aws-cli:2.15.17
 
 ARG TARGETOS TARGETARCH
 ARG USERNAME=user
 ARG GROUPNAME=user
 ARG UID=1000
 ARG GID=1000
 ARG AWS_VAULT_VERSION="7.2.0"
-ARG TFSEC_VERSION="1.28.4"
-ARG TFLINT_VERSION="0.49.0"
+ARG TFSEC_VERSION="1.28.5"
+ARG TFLINT_VERSION="0.50.2"
 LABEL maintainer="tier940"
 
 RUN yum install -y shadow-utils tzdata git tar unzip > /dev/null \

terraform/aws/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 services:
   terraform:
     build:

terraform/gcp/Dockerfile

@@ -1,8 +1,8 @@
-FROM --platform=$BUILDPLATFORM docker.io/google/cloud-sdk:alpine
+FROM --platform=$BUILDPLATFORM gcr.io/google.com/cloudsdktool/cloud-sdk:462.0.1-alpine
 
 ARG TARGETOS TARGETARCH
-ARG TFSEC_VERSION="1.28.4"
-ARG TFLINT_VERSION="0.49.0"
+ARG TFSEC_VERSION="1.28.5"
+ARG TFLINT_VERSION="0.50.2"
 LABEL maintainer="tier940"
 
 RUN apk add curl bash git unzip \

terraform/gcp/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 services:
   terraform:
     build:

web/airflow/Dockerfile

@@ -1,7 +1,7 @@
-FROM --platform=$BUILDPLATFORM docker.io/apache/airflow:2.8.0-python3.11
+FROM --platform=$BUILDPLATFORM docker.io/apache/airflow:2.8.1-python3.11
 
 # Setup Airflow
-ENV AIRFLOW_VERSION=2.8.0
+ENV AIRFLOW_VERSION=2.8.1
 ENV PYTHON_VERSION=3.11
 
 COPY entrypoint.sh /entrypoint.sh

web/airflow/README.md

@@ -1,7 +1,7 @@
 # Docker Airflow2
 ## Informations
 
-* Based on official Airflow 2 Image [apache/airflow:2.8.0-python3.11](https://hub.docker.com/r/apache/airflow) and uses the official [Postgres](https://hub.docker.com/_/postgres/) as backend and [Redis](https://hub.docker.com/_/redis/) as queue
+* Based on official Airflow 2 Image [apache/airflow:2.8.1-python3.11](https://hub.docker.com/r/apache/airflow) and uses the official [Postgres](https://hub.docker.com/_/postgres/) as backend and [Redis](https://hub.docker.com/_/redis/) as queue
 * Docker entrypoint script is forked from [dataops-sre/docker-airflow2](https://github.com/dataops-sre/docker-airflow2)
 * Install [Docker](https://www.docker.com/)
 * Install [Docker Compose](https://docs.docker.com/compose/install/)

web/airflow/docker-compose-CeleryExecutor.yml

@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 services:
   redis:
     image: 'redis:7'

web/airflow/docker-compose-LocalExecutor.yml

@@ -1,4 +1,4 @@
-version: '3.9'
+version: "3.9"
 services:
   postgres:
     image: postgres:15