🗃️ Committing everything that changed 🗃️

Dockerfile.8-dev
Dockerfile.9-dev
This commit is contained in:
casjay 2024-09-05 08:05:30 -04:00
parent 2b0802adb1
commit 4aaf7d303b
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
2 changed files with 18 additions and 8 deletions

View File

@ -16,7 +16,7 @@ ARG SHELL_OPTS="set -e -o pipefail"
ARG SERVICE_PORT="" ARG SERVICE_PORT=""
ARG EXPOSE_PORTS="" ARG EXPOSE_PORTS=""
ARG PHP_VERSION="system" ARG PHP_VERSION="7.4"
ARG NODE_VERSION="system" ARG NODE_VERSION="system"
ARG NODE_MANAGER="system" ARG NODE_MANAGER="system"
@ -111,6 +111,15 @@ RUN echo "Initializing packages before copying files to image"; \
if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
echo "" echo ""
RUN echo "Setting up dev system"; \
bash -c "$(curl -q -LSsf "https://github.com/casjay-base/centos/raw/main/root/.local/bin/fetch-repo-file")"; \
[ ! -d "/usr/local/share/CasjaysDev/scripts" ] && \
git clone -q https://github.com/casjay-dotfiles/scripts "/usr/local/share/CasjaysDev/scripts" && \
/usr/local/share/CasjaysDev/scripts/install.sh; \
dnf module -y reset php;dnf module -y install php:remi-$PHP_VERSION; \
pkg="$(curl -q -LSsf "https://github.com/pkmgr/centos/raw/main/lists/development.list")"; \
[ -n "$pkg" ] && yum install -yy --skip-broken "$pkg"
COPY ./rootfs/. / COPY ./rootfs/. /
COPY ./Dockerfile.8 /root/docker/Dockerfile COPY ./Dockerfile.8 /root/docker/Dockerfile

View File

@ -106,13 +106,14 @@ RUN echo "Setting up and installing packages"; \
if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \ if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
echo "" echo ""
RUN echo "Setting up dev system" \ RUN echo "Setting up dev system"; \
yum install -y git curl wget \ bash -c "$(curl -q -LSsf "https://github.com/casjay-base/centos/raw/main/root/.local/bin/fetch-repo-file")"; \
bash -c "$(curl -q -LSsf "https://github.com/casjay-base/centos/raw/main/root/.local/bin/fetch-repo-file")" \ [ ! -d "/usr/local/share/CasjaysDev/scripts" ] && \
PHP_VER="7.4";dnf module -y reset php;dnf module -y install php:remi-$PHP_VER \ git clone -q https://github.com/casjay-dotfiles/scripts "/usr/local/share/CasjaysDev/scripts" && \
sudo bash -c "$(curl -q -LSsf "https://github.com/pkmgr/centos/raw/main/scripts/min.sh")" \ /usr/local/share/CasjaysDev/scripts/install.sh; \
pkg="$(curl -q -LSsf "https://github.com/pkmgr/centos/raw/main/lists/development.list" )" \ dnf module -y reset php;dnf module -y install php:remi-$PHP_VERSION; \
[ -n "$pkg" ] && yum install -yy $pkg pkg="$(curl -q -LSsf "https://github.com/pkmgr/centos/raw/main/lists/development.list")"; \
[ -n "$pkg" ] && yum install -yy --skip-broken "$pkg"
RUN echo "Initializing packages before copying files to image"; \ RUN echo "Initializing packages before copying files to image"; \
$SHELL_OPTS; \ $SHELL_OPTS; \