Compare commits

...

11 Commits

10 changed files with 64 additions and 10 deletions

2
.gitignore vendored
View File

@@ -29,7 +29,7 @@ disabled
disabled.* disabled.*
# Ignore any .env files which are not explicitly committed to the project. # Ignore any .env files which are not explicitly committed to the project.
*.env .env
# 2024-01-23 Ignore true docker-compose files, only show examples from now on. # 2024-01-23 Ignore true docker-compose files, only show examples from now on.
docker-compose.yml docker-compose.yml

View File

@@ -2,7 +2,16 @@
FROM archlinux:base FROM archlinux:base
RUN pacman -Syu --noconfirm && pacman -Sy --noconfirm $PACKAGES $EXTRA_ARCH ARG PACKAGES
ENV PACKAGES="$PACKAGES"
ARG EXTRA_ARCH
ENV EXTRA_ARCH="$EXTRA_ARCH"
# Arch is rolling, and therefore recommends updating the container immediately.
# https://hub.docker.com/_/archlinux#updating
RUN pacman -Syyu --noconfirm
RUN pacman -Syy --noconfirm $PACKAGES $EXTRA_ARCH
COPY bin/main.sh /root/main.sh COPY bin/main.sh /root/main.sh
RUN chmod +x /root/main.sh RUN chmod +x /root/main.sh

View File

@@ -1,8 +1,16 @@
# Create a VM for testing Ansible provisioning. # Create a VM for testing Ansible provisioning.
FROM debian:trixie FROM debian:latest
RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_DEBIAN ARG PACKAGES
ENV PACKAGES="$PACKAGES"
ARG EXTRA_DEBIAN
ENV EXTRA_DEBIAN="$EXTRA_DEBIAN"
# Use the image as it comes, do not upgrade it, so that it stays reproducible.
#RUN apt update && apt dist-upgrade -y
RUN apt update && apt install -y $PACKAGES $EXTRA_DEBIAN
COPY bin/main.sh /root/main.sh COPY bin/main.sh /root/main.sh
RUN chmod +x /root/main.sh RUN chmod +x /root/main.sh

View File

@@ -2,7 +2,15 @@
FROM fedora:latest FROM fedora:latest
RUN dnf upgrade --refresh -y && dnf install -y $PACKAGES $EXTRA_FEDORA ARG PACKAGES
ENV PACKAGES="$PACKAGES"
ARG EXTRA_FEDORA
ENV EXTRA_FEDORA="$EXTRA_FEDORA"
# Use the image as it comes, do not upgrade it, so that it stays reproducible.
#RUN dnf upgrade --refresh -y
RUN dnf install --refresh -y $PACKAGES $EXTRA_FEDORA
COPY bin/main.sh /root/main.sh COPY bin/main.sh /root/main.sh
RUN chmod +x /root/main.sh RUN chmod +x /root/main.sh

View File

@@ -1,10 +1,16 @@
# Create a VM for testing Ansible provisioning. # Create a VM for testing Ansible provisioning.
FROM opensuse/tumbleweed FROM opensuse/tumbleweed:latest
RUN zypper -n refresh \ ARG PACKAGES
&& zypper -n dist-upgrade -y \ ENV PACKAGES="$PACKAGES"
&& zypper -n install -y $PACKAGES $EXTRA_OPENSUSE ARG EXTRA_OPENSUSE
ENV EXTRA_OPENSUSE="$EXTRA_OPENSUSE"
# Use the image as it comes, do not upgrade it, so that it stays reproducible.
#RUN zypper -n refresh && zypper -n dist-upgrade -y
RUN zypper -n refresh && zypper -n install -y $PACKAGES $EXTRA_OPENSUSE
COPY bin/main.sh /root/main.sh COPY bin/main.sh /root/main.sh
RUN chmod +x /root/main.sh RUN chmod +x /root/main.sh

View File

@@ -2,7 +2,15 @@
FROM ubuntu:rolling FROM ubuntu:rolling
RUN apt update && apt dist-upgrade -y && apt install -y $PACKAGES $EXTRA_UBUNTU ARG PACKAGES
ENV PACKAGES="$PACKAGES"
ARG EXTRA_UBUNTU
ENV EXTRA_UBUNTU="$EXTRA_UBUNTU"
# Use the image as it comes, do not upgrade it, so that it stays reproducible.
#RUN apt update && apt dist-upgrade -y
RUN apt update && apt install -y $PACKAGES $EXTRA_UBUNTU
COPY bin/main.sh /root/main.sh COPY bin/main.sh /root/main.sh
RUN chmod +x /root/main.sh RUN chmod +x /root/main.sh

View File

@@ -17,6 +17,9 @@ services:
context: ./ context: ./
dockerfile: Dockerfiles/arch dockerfile: Dockerfiles/arch
network: host network: host
args:
PACKAGES: ${PACKAGES}
EXTRA_ARCH: ${EXTRA_ARCH}
restart: no restart: no
environment: environment:
- PACKAGES=$PACKAGES - PACKAGES=$PACKAGES
@@ -43,6 +46,9 @@ services:
context: ./ context: ./
dockerfile: Dockerfiles/debian dockerfile: Dockerfiles/debian
network: host network: host
args:
PACKAGES: ${PACKAGES}
EXTRA_DEBIAN: ${EXTRA_DEBIAN}
restart: no restart: no
environment: environment:
- PACKAGES=$PACKAGES - PACKAGES=$PACKAGES
@@ -69,6 +75,9 @@ services:
context: ./ context: ./
dockerfile: Dockerfiles/fedora dockerfile: Dockerfiles/fedora
network: host network: host
args:
PACKAGES: ${PACKAGES}
EXTRA_FEDORA: ${EXTRA_FEDORA}
restart: no restart: no
environment: environment:
- PACKAGES=$PACKAGES - PACKAGES=$PACKAGES
@@ -95,6 +104,9 @@ services:
context: ./ context: ./
dockerfile: Dockerfiles/opensuse dockerfile: Dockerfiles/opensuse
network: host network: host
args:
PACKAGES: ${PACKAGES}
EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
restart: no restart: no
environment: environment:
- PACKAGES=$PACKAGES - PACKAGES=$PACKAGES
@@ -121,6 +133,9 @@ services:
context: ./ context: ./
dockerfile: Dockerfiles/ubuntu dockerfile: Dockerfiles/ubuntu
network: host network: host
args:
PACKAGES: ${PACKAGES}
EXTRA_UBUNTU: ${EXTRA_UBUNTU}
restart: no restart: no
environment: environment:
- PACKAGES=$PACKAGES - PACKAGES=$PACKAGES