Skip to content

Commit

Permalink
Revert "ci: pass extra pgk and rpm to dcache container"
Browse files Browse the repository at this point in the history
This reverts commit f7b8b4d.
  • Loading branch information
kofemann committed Aug 18, 2023
1 parent 1398b38 commit 21f441b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ container:
/kaniko/executor
--label dcache.build=testing
--context $CI_PROJECT_DIR
--build-arg "EXTRA_PKG=openssl"
--build-arg "EXTRA_RPM='https://www.desy.de/~tigran/ca_dCacheORG-3.0-6.noarch.rpm https://linuxsoft.cern.ch/wlcg/centos7/x86_64/desy-voms-all-1.0.0-1.noarch.rpm'"
--dockerfile $CI_PROJECT_DIR/Dockerfile
--destination $CI_REGISTRY_IMAGE:$tag
Expand Down
7 changes: 1 addition & 6 deletions packages/tar/src/main/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
FROM almalinux:9-minimal

ENV DCACHE_INSTALL_DIR=/opt/dcache
ARG EXTRA_PKG
ARG EXTRA_RPM

# Neede by groupadd and useradd
# REVISIT: in some environments base OS kernel doesnt allow use of xattrs and the installation of
Expand All @@ -21,10 +19,7 @@ RUN echo "dcache:x:994:1000::/home/dcache:/bin/bash" >> /etc/passwd
RUN echo "dcache:!!:18438::::::" >> /etc/shadow

# Add JRE
RUN microdnf -y install java-17-openjdk-headless hostname which procps-ng $EXTRA_PKG

# Install extra packages, if provided
RUN if [ -n "EXTRA_RPM" ]; then for p in $EXTRA_RPM; do rpm -i $p; done; fi
RUN microdnf -y install java-17-openjdk-headless hostname which procps-ng

# Add dCache
COPY maven /opt/dcache
Expand Down

0 comments on commit 21f441b

Please sign in to comment.