Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI updates for PKI 11.5 #4678

Merged
merged 4 commits into from
Feb 29, 2024
Merged

CI updates for PKI 11.5 #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3534c36
Update container version numbers
edewata Feb 26, 2024
01f5f64
Update default BASE_IMAGE
edewata Feb 26, 2024
cef2d2d
Remove default COPR_REPO
edewata Feb 26, 2024
a017da1
Update publishing jobs
edewata Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/acme-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: ACME Tests
on: [push, pull_request]

env:
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:40' }}
COPR_REPO: ${{ vars.COPR_REPO }}

jobs:
build:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
uses: ./.github/workflows/acme-postgresql-test.yml

publish:
if: github.event_name == 'push' && github.ref_name == 'master'
if: github.event_name == 'push' && github.ref_name == 'v11.5'
name: Publishing ACME images
needs: build
runs-on: ubuntu-latest
Expand Down Expand Up @@ -147,5 +147,5 @@ jobs:

- name: Publish pki-acme image
run: |
docker tag pki-acme ${{ vars.REGISTRY }}/$NAMESPACE/pki-acme:latest
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-acme:latest
docker tag pki-acme ${{ vars.REGISTRY }}/$NAMESPACE/pki-acme:11.5
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-acme:11.5
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Build PKI
on: [push, pull_request]

env:
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:40' }}
COPR_REPO: ${{ vars.COPR_REPO }}
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ipa-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: IPA Tests
on: [push, pull_request]

env:
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:40' }}
COPR_REPO: ${{ vars.COPR_REPO }}

jobs:
build:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish PKI
on:
push:
branches:
- master
- v11.5

env:
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
Expand Down Expand Up @@ -91,15 +91,15 @@ jobs:

- name: Publish pki-dist image
run: |
docker tag pki-dist ${{ vars.REGISTRY }}/$NAMESPACE/pki-dist:latest
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-dist:latest
docker tag pki-dist ${{ vars.REGISTRY }}/$NAMESPACE/pki-dist:11.5
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-dist:11.5

- name: Publish pki-server image
run: |
docker tag pki-server ${{ vars.REGISTRY }}/$NAMESPACE/pki-server:latest
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-server:latest
docker tag pki-server ${{ vars.REGISTRY }}/$NAMESPACE/pki-server:11.5
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-server:11.5

- name: Publish pki-ca image
run: |
docker tag pki-ca ${{ vars.REGISTRY }}/$NAMESPACE/pki-ca:latest
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-ca:latest
docker tag pki-ca ${{ vars.REGISTRY }}/$NAMESPACE/pki-ca:11.5
docker push ${{ vars.REGISTRY }}/$NAMESPACE/pki-ca:11.5
4 changes: 2 additions & 2 deletions .github/workflows/sonarcloud-pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- completed

env:
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:latest' }}
COPR_REPO: ${{ vars.COPR_REPO || '@pki/master' }}
BASE_IMAGE: ${{ vars.BASE_IMAGE || 'registry.fedoraproject.org/fedora:40' }}
COPR_REPO: ${{ vars.COPR_REPO }}
NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || 'dogtagpki' }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG COMPONENT="dogtag-pki"
ARG LICENSE="GPLv2 and LGPLv2"
ARG ARCH="x86_64"
ARG VERSION="0"
ARG BASE_IMAGE="registry.fedoraproject.org/fedora:latest"
ARG BASE_IMAGE="registry.fedoraproject.org/fedora:40"
ARG COPR_REPO=""
ARG BUILD_OPTS=""

Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
import os
import re

value = os.getenv('BASE_IMAGE', 'registry.fedoraproject.org/fedora:latest')
value = os.getenv('BASE_IMAGE', 'registry.fedoraproject.org/fedora:40')
print('BASE_IMAGE: {value}'.format(value=value))
print('##vso[task.setvariable variable=BASE_IMAGE]{value}'.format(value=value))

Expand All @@ -30,15 +30,15 @@ jobs:
docker build \
--build-arg BASE_IMAGE=$BASE_IMAGE \
--target pki-base \
--tag pki-base:latest \
--tag pki-base:11.5 \
.

docker run \
--name=runner \
-v $BUILD_SOURCESDIRECTORY:/root/src \
--privileged \
--detach \
pki-base:latest
pki-base:11.5

while :
do
Expand Down
2 changes: 1 addition & 1 deletion base/acme/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# https://docs.fedoraproject.org/en-US/containers/guidelines/guidelines/

FROM registry.fedoraproject.org/fedora:latest
FROM registry.fedoraproject.org/fedora:40

ARG NAME="pki-acme"
ARG SUMMARY="Dogtag PKI ACME Responder"
Expand Down
4 changes: 2 additions & 2 deletions base/acme/openshift/pki-acme-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: pki-acme
image: 'quay.io/dogtagpki/pki-acme:latest'
image: 'quay.io/dogtagpki/pki-acme:11.5'
imagePullPolicy: Always
volumeMounts:
- mountPath: /var/lib/tomcats/pki/conf/certs
Expand Down Expand Up @@ -52,6 +52,6 @@ spec:
- pki-acme
from:
kind: ImageStreamTag
name: 'pki-acme:latest'
name: 'pki-acme:11.5'
type: ImageChange
- type: ConfigChange
4 changes: 2 additions & 2 deletions base/acme/openshift/pki-acme-is.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
tags:
- from:
kind: DockerImage
name: quay.io/dogtagpki/pki-acme:latest
name: latest
name: quay.io/dogtagpki/pki-acme:11.5
name: 11.5
referencePolicy:
type: Source
2 changes: 1 addition & 1 deletion base/ca/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# https://docs.fedoraproject.org/en-US/containers/guidelines/guidelines/

FROM registry.fedoraproject.org/fedora:latest
FROM registry.fedoraproject.org/fedora:40

ARG NAME="pki-ca"
ARG SUMMARY="Dogtag PKI Certificate Authority"
Expand Down
Loading