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.

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

Make Quickstarters use Nexus Docker proxy instead of DockerHub #1000

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Added secret scanning in docker plain ([#963](https://github.com/opendevstack/ods-quickstarters/pull/963))
- Update api version in ocp templates for image, buildconfig, route and deploymentconfig ([#1072](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1072))
- Update Makefile adding all missing agents ([#999](https://github.com/opendevstack/ods-quickstarters/pull/999))
- Make Quickstarters use Nexus Docker proxy instead of DockerHub ([#997](https://github.com/opendevstack/ods-quickstarters/issues/997))

## [4.3.1] - 2024-02-19

Expand Down
20 changes: 20 additions & 0 deletions be-fe-mono-repo-plain/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,25 @@ odsQuickstarterPipeline(

odsQuickstarterStageRenderJenkinsfile(context)

stage("Create Frontend docker folder") {
sh "mkdir -p ${context.componentId}/docker_fe"
}

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'docker_fe/Dockerfile.template',
target: 'docker_fe/Dockerfile']
)

stage("Create Backend docker folder") {
sh "mkdir -p ${context.componentId}/docker_be"
}

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'docker_be/Dockerfile.template',
target: 'docker_be/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# add /overwrite FROM with your base image, and do whatever you like here :)
FROM alpine:latest
FROM docker-group-@ods_namespace@.@app_domain@/alpine:latest

RUN echo "building simple backend container"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# add /overwrite FROM with your base image, and do whatever you like here :)
FROM alpine:latest
FROM docker-group-@ods_namespace@.@app_domain@/alpine:latest

RUN echo "building simple frontend container"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://github.com/openresty/docker-openresty
FROM openresty/openresty:1.25.3.1-1-rocky
FROM docker-group-@ods_namespace@.@app_domain@/openresty/openresty:1.25.3.1-1-rocky

ENV LANG=C.UTF-8

Expand Down
6 changes: 6 additions & 0 deletions be-gateway-nginx/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ odsQuickstarterPipeline(
)

odsQuickstarterStageRenderJenkinsfile(context)

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM docker-group-@ods_namespace@.@app_domain@/alpine

# Uncomment this section if you need to use glibc in your container, f.e. when you enable CGO_ENABLED=1
# Set locale
Expand Down
10 changes: 10 additions & 0 deletions be-golang-plain/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,15 @@ odsQuickstarterPipeline(

odsQuickstarterStageRenderJenkinsfile(context)

stage("Create docker folder") {
sh "mkdir -p ${context.componentId}/docker"
}

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine
FROM docker-group-@ods_namespace@.@app_domain@/node:20-alpine

COPY dist /node

Expand Down
10 changes: 10 additions & 0 deletions be-typescript-express/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ odsQuickstarterPipeline(
)
odsQuickstarterStageRenderJenkinsfile(context)

stage("Create docker folder") {
sh "mkdir -p ${context.componentId}/docker"
}

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# add /overwrite FROM with your base image, and do whatever you like here :)
FROM alpine:latest
FROM docker-group-@ods_namespace@.@app_domain@/alpine:latest

RUN echo "building simple container"

Expand Down
10 changes: 10 additions & 0 deletions docker-plain/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,15 @@ odsQuickstarterPipeline(

odsQuickstarterStageRenderJenkinsfile(context)

stage("Create docker folder") {
sh "mkdir -p ${context.componentId}/docker"
}

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.25.3-alpine
FROM docker-group-@ods_namespace@.@app_domain@/nginx:1.25.3-alpine

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
Expand Down
6 changes: 6 additions & 0 deletions fe-angular/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,11 @@ odsQuickstarterPipeline(

odsQuickstarterStageRenderJenkinsfile(context)

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.25.3-alpine
FROM docker-group-@ods_namespace@.@app_domain@/nginx:1.25.3-alpine

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
Expand Down
6 changes: 6 additions & 0 deletions fe-ionic/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,11 @@ odsQuickstarterPipeline(

odsQuickstarterStageRenderJenkinsfile(context)

odsQuickstarterStageRenderJenkinsfile(
context,
[source: 'Dockerfile.template',
target: 'docker/Dockerfile']
)

odsQuickstarterStageRenderSonarProperties(context)
}