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

SONAR-22607 Restore the usage of Ubuntu Jammy in the base image #694

Merged
merged 2 commits into from
Jul 24, 2024
Merged

SONAR-22607 Restore the usage of Ubuntu Jammy in the base image #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1e3a5
SONAR-22607 Restore the usage of Ubuntu Jammy in the base image
carminevassallo Jul 24, 2024
106a737
Clean up the docker config file before login
carminevassallo Jul 24, 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
5 changes: 5 additions & 0 deletions .cirrus/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ multi_arch_build_gcp_prod_task:
- docker pull "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search"
login_to_gcr_script:
- export DOCKER_GCLOUD_PASSWORD=$(echo ${DOCKER_GCLOUD_SA_KEY} | base64 -d)
- rm -rf ~/.docker/config.json
- docker login -u _json_key -p "$DOCKER_GCLOUD_PASSWORD" https://${GCLOUD_REGISTRY}
tag_and_promote_script:
- export CURRENT_MINOR_VERSION=$(echo ${CURRENT_VERSION} | cut -d '.' -f 1,2)
Expand All @@ -68,6 +69,7 @@ multi_arch_build_gcp_staging_task:
<<: *VM_TEMPLATE
login_to_gcr_script:
- export DOCKER_GCLOUD_PASSWORD=$(echo ${DOCKER_GCLOUD_SA_KEY} | base64 -d)
- rm -rf ~/.docker/config.json
- docker login -u _json_key -p "$DOCKER_GCLOUD_PASSWORD" https://${GCLOUD_STAGING_REGISTRY}
setup_multi_build_script:
- docker run -t --rm --privileged tonistiigi/binfmt --install all
Expand Down Expand Up @@ -106,6 +108,7 @@ multi_arch_build_task:
ec2_instance:
<<: *VM_TEMPLATE
login_script:
- rm -rf ~/.docker/config.json
- docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
setup_script:
- docker run -t --rm --privileged tonistiigi/binfmt --install all
Expand All @@ -127,6 +130,7 @@ private_scan_task:
ec2_instance:
<<: *CI_SCANNER
login_script:
- rm -rf ~/.docker/config.json
- docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
scan_script:
- echo "docker.includes=${tag}" >> .cirrus/wss-unified-agent.config
Expand Down Expand Up @@ -187,6 +191,7 @@ multi_arch_test_task:
type: ${INSTANCE_TYPE}
architecture: ${CIRRUS_ARCH}
login_script:
- rm -rf ~/.docker/config.json
- docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
test_script:
- echo "Test the ${STAGING_IMAGE_NAME}:${tag} image supporting linux/${CIRRUS_ARCH}"
Expand Down
2 changes: 1 addition & 1 deletion 10/community/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 10/datacenter/app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 10/datacenter/search/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 10/developer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 10/enterprise/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 9/community/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 9/datacenter/app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 9/datacenter/search/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 9/developer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
2 changes: 1 addition & 1 deletion 9/enterprise/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre
FROM eclipse-temurin:17-jre-jammy

LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube

Expand Down
Loading