Skip to content

Commit 0071a6d

Browse files
moufmoufmoufmouf
committed
Adding Debian Trixie variants
In addition to Bullseye, we now add Debian Trixie images
1 parent f1276a4 commit 0071a6d

44 files changed

Lines changed: 3005 additions & 57 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/workflow.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,22 @@ jobs:
4040
- variant: '22-apache-bullseye-build'
4141
- variant: '24-apache-bullseye-build'
4242
- variant: '26-apache-bullseye-build'
43+
- variant: '20-trixie'
44+
- variant: '22-trixie'
45+
- variant: '24-trixie'
46+
- variant: '26-trixie'
47+
- variant: '20-apache-trixie'
48+
- variant: '22-apache-trixie'
49+
- variant: '24-apache-trixie'
50+
- variant: '26-apache-trixie'
51+
- variant: '20-trixie-build'
52+
- variant: '22-trixie-build'
53+
- variant: '24-trixie-build'
54+
- variant: '26-trixie-build'
55+
- variant: '20-apache-trixie-build'
56+
- variant: '22-apache-trixie-build'
57+
- variant: '24-apache-trixie-build'
58+
- variant: '26-apache-trixie-build'
4359
runs-on: ubuntu-latest
4460
steps:
4561
- name: Set up QEMU

‎Dockerfile.16-apache-bullseye‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.16-apache-bullseye-build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.16-bullseye‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.16-bullseye-build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.18-apache-bullseye‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.18-apache-bullseye-build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.18-bullseye‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.18-bullseye-build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

‎Dockerfile.20-apache-bullseye‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
1+
# DO NOT EDIT THIS FILE : Make your changes in /utils/Dockerfile.blueprint)
22
FROM debian:bullseye-slim
33

44
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -34,7 +34,7 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
3434
# | Define a default user with sudo rights.
3535
# |
3636

37-
RUN useradd -ms /bin/bash docker && adduser docker sudo
37+
RUN useradd -ms /bin/bash docker && usermod -a -G sudo docker
3838
# Users in the sudoers group can sudo as root without password.
3939
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4040

0 commit comments

Comments
 (0)