Skip to content

Commit

Permalink
Update container versions
Browse files Browse the repository at this point in the history
  • Loading branch information
edewata committed Mar 28, 2024
1 parent 27e7dfc commit 19077f9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ipa-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@ jobs:
build:
name: Building IPA images
runs-on: ubuntu-latest
env:
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}
steps:
- name: Clone repository
uses: actions/checkout@v4

- name: Update Dockerfile
run: |
# update registry namespace
sed -i "s/quay.io\/dogtagpki\//quay.io\/$NAMESPACE\//g" Dockerfile
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ FROM pki-builder-deps AS pki-builder
ARG BUILD_OPTS

# Import JSS packages
COPY --from=quay.io/dogtagpki/jss-dist:latest /root/RPMS /tmp/RPMS/
COPY --from=quay.io/dogtagpki/jss-dist:5.5 /root/RPMS /tmp/RPMS/

# Import LDAP SDK packages
COPY --from=quay.io/dogtagpki/ldapjdk-dist:latest /root/RPMS /tmp/RPMS/
COPY --from=quay.io/dogtagpki/ldapjdk-dist:5.5 /root/RPMS /tmp/RPMS/

# Install build dependencies
RUN dnf localinstall -y /tmp/RPMS/* \
Expand All @@ -85,10 +85,10 @@ COPY --from=pki-builder /root/pki/build/RPMS /root/RPMS/
FROM pki-deps AS pki-runner

# Import JSS packages
COPY --from=quay.io/dogtagpki/jss-dist:latest /root/RPMS /tmp/RPMS/
COPY --from=quay.io/dogtagpki/jss-dist:5.5 /root/RPMS /tmp/RPMS/

# Import LDAP SDK packages
COPY --from=quay.io/dogtagpki/ldapjdk-dist:latest /root/RPMS /tmp/RPMS/
COPY --from=quay.io/dogtagpki/ldapjdk-dist:5.5 /root/RPMS /tmp/RPMS/

# Import PKI packages
COPY --from=pki-dist /root/RPMS /tmp/RPMS/
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ jobs:
docker exec runner dnf install -y dnf-plugins-core rpm-build
if [ -n "$COPR_REPO" ]; then docker exec runner dnf copr enable -y $COPR_REPO; fi
docker create --name=jss-dist quay.io/$NAMESPACE/jss-dist:latest
docker create --name=jss-dist quay.io/$NAMESPACE/jss-dist:5.5
docker cp jss-dist:/root/RPMS/. /tmp/RPMS
docker rm -f jss-dist
docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:5.5
docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS
docker rm -f ldapjdk-dist
docker create --name=idm-console-framework-dist quay.io/$NAMESPACE/idm-console-framework-dist:latest
docker create --name=idm-console-framework-dist quay.io/$NAMESPACE/idm-console-framework-dist:2.1
docker cp idm-console-framework-dist:/root/RPMS/. /tmp/RPMS
docker rm -f idm-console-framework-dist
Expand Down

0 comments on commit 19077f9

Please sign in to comment.