Fix build process not being able to see packages.

This commit is contained in:
2025-10-22 20:51:57 -07:00
parent 369728b7ef
commit c0a220cebe
7 changed files with 55 additions and 12 deletions

View File

@@ -2,7 +2,13 @@
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"
#RUN pacman -Syu --noconfirm
RUN pacman -Sy --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

@@ -2,7 +2,13 @@
FROM debian:trixie FROM debian:trixie
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"
#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,13 @@
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"
#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

@@ -2,9 +2,13 @@
FROM opensuse/tumbleweed FROM opensuse/tumbleweed
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"
#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,13 @@
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"
#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

View File

@@ -12,11 +12,11 @@ PT_STORAGE_DIR=/tmp/ProvisionTests
## Packages ## Packages
PACKAGES="git bash curl sudo which" PACKAGES="git bash curl sudo which"
EXTRA_ARCH="" EXTRA_ARCH="htop"
EXTRA_DEBIAN="" EXTRA_DEBIAN="htop"
EXTRA_FEDORA="" EXTRA_FEDORA="htop"
EXTRA_OPENSUSE="" EXTRA_OPENSUSE="htop"
EXTRA_UBUNTU="" EXTRA_UBUNTU="htop"
## Script ## Script
REPO=https://git.hyperling.com/me/env-ansible REPO=https://git.hyperling.com/me/env-ansible