diff --git a/Dockerfile b/Dockerfile index be59ff0..933e9e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,14 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \ which \ zip +# execute local files COPY installation-scripts /tmp/installation-scripts +RUN for f in {00-pacman-mirror.sh,01-rustup.sh}; do /tmp/installation-scripts/$f; done && \ + rm --recursive --force /tmp/installation-scripts +ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}" # Install PKGs from own repo -RUN /tmp/installation-scripts/00-pacman-mirror.sh RUN pacman --sync --refresh --noconfirm --sysupgrade \ - docker-pushrm \ oracle-instantclient-basic \ oracle-instantclient-jdbc \ oracle-instantclient-odbc \ @@ -26,9 +28,4 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \ oracle-instantclient-tools \ rpm-builder -ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}" - -RUN for f in {01-rustup.sh,02-go-bindata.sh}; do /tmp/installation-scripts/$f; done && \ - rm --recursive --force /tmp/installation-scripts - WORKDIR /workspace \ No newline at end of file diff --git a/Makefile b/Makefile index 58ec842..aec0cc8 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ container-image/delete: # ============================================================================== PHONY+=container-image/push container-image/push: - ${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password ${BUILD_IMAGE_REGISTRY_PASSWORD} + echo ${BUILD_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password-stdin ${CONTAINER_RUNTIME} push ${BUILD_IMAGE_FULLY_QUALIFIED} # PHONY diff --git a/installation-scripts/00-pacman-mirror.sh b/installation-scripts/00-pacman-mirror.sh index 53b90ae..8cb78bf 100755 --- a/installation-scripts/00-pacman-mirror.sh +++ b/installation-scripts/00-pacman-mirror.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + cat > /etc/pacman.d/gnupg/dirmngr.conf <> /etc/pacman.conf <