volker.raschek/build-image
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix: remove docker-pushrm
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Markus Pesch 2021-09-01 08:57:34 +02:00
parent 4ed6abb406
commit 57d2cc6440
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -12,12 +12,14 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \
which \ which \
zip zip
# execute local files
COPY installation-scripts /tmp/installation-scripts 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 # Install PKGs from own repo
RUN /tmp/installation-scripts/00-pacman-mirror.sh
RUN pacman --sync --refresh --noconfirm --sysupgrade \ RUN pacman --sync --refresh --noconfirm --sysupgrade \
docker-pushrm \
oracle-instantclient-basic \ oracle-instantclient-basic \
oracle-instantclient-jdbc \ oracle-instantclient-jdbc \
oracle-instantclient-odbc \ oracle-instantclient-odbc \
@ -26,9 +28,4 @@ RUN pacman --sync --refresh --noconfirm --sysupgrade \
oracle-instantclient-tools \ oracle-instantclient-tools \
rpm-builder 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 WORKDIR /workspace

2
Makefile
View File

@ -36,7 +36,7 @@ container-image/delete:
# ============================================================================== # ==============================================================================
PHONY+=container-image/push PHONY+=container-image/push
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} ${CONTAINER_RUNTIME} push ${BUILD_IMAGE_FULLY_QUALIFIED}
# PHONY # PHONY

10
installation-scripts/00-pacman-mirror.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
cat > /etc/pacman.d/gnupg/dirmngr.conf <<EOF cat > /etc/pacman.d/gnupg/dirmngr.conf <<EOF
keyserver hkps://hkps.pool.sks-keyservers.net:443 keyserver hkps://hkps.pool.sks-keyservers.net:443
keyserver hkp://pool.sks-keyservers.net:80 keyserver hkp://pool.sks-keyservers.net:80
@ -7,19 +9,17 @@ EOF
# Initialize pacman-key ring # Initialize pacman-key ring
pacman-key --init pacman-key --init
pacman-key --refresh-keys # pacman-key --refresh-keys
# Add GPG Key
pacman-key --recv-keys 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
pacman-key --lsign 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
# Add additional pacman mirrors # Add additional pacman mirrors
cat >> /etc/pacman.conf <<EOF cat >> /etc/pacman.conf <<EOF
[any] [any]
SigLevel = Optional TrustAll
Server = https://aur.cryptic.systems/any/ Server = https://aur.cryptic.systems/any/
[x86_64] [x86_64]
SigLevel = Optional TrustAll
Server = https://aur.cryptic.systems/x86_64/ Server = https://aur.cryptic.systems/x86_64/
[oracle] [oracle]

3
installation-scripts/02-go-bindata.sh
View File

@ -1,3 +0,0 @@
#!/bin/bash
go get -u github.com/go-bindata/go-bindata/...