Skip to content

Commit a7b1cab

Browse files
BraisVQBraisVQ
authored
Merge branch 'master' into docker-plain-helm-chart
2 parents d1f9713 + 996aedf commit a7b1cab

File tree

39 files changed

+314
-191
lines changed

39 files changed

+314
-191
lines changed

‎.github/workflows/continuous-integration-workflow.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ jobs:
127127
name: Build docker image
128128
working-directory: common/jenkins-agents/terraform-2306/docker
129129
run: |
130-
docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 .
130+
docker build --tag agent-terraform-2306-test-ubi8 --file Dockerfile.ubi8 \
131+
--build-arg nexusUrl=https://nexus.example.com \
132+
--build-arg nexusAuth=developer:s3cr3t \
133+
--build-arg NPMJS_REGISTRY_FLAG=--registry=https://registry.npmjs.org \
134+
.
131135
132136
jenkins-agent-terraform-2408-ubi8:
133137
name: Jenkins agent Terraform 2408 (UBI8)
@@ -140,7 +144,11 @@ jobs:
140144
name: Build docker image
141145
working-directory: common/jenkins-agents/terraform-2408/docker
142146
run: |
143-
docker build --tag agent-terraform-2408-test-ubi8 --file Dockerfile.ubi8 .
147+
docker build --tag agent-terraform-2408-test-ubi8 --file Dockerfile.ubi8 \
148+
--build-arg nexusUrl=https://nexus.example.com \
149+
--build-arg nexusAuth=developer:s3cr3t \
150+
--build-arg NPMJS_REGISTRY_FLAG=--registry=https://registry.npmjs.org \
151+
.
144152
145153
jenkins-agent-scala-ubi8:
146154
name: Jenkins agent Scala (UBI8)

‎CHANGELOG.md‎

Lines changed: 59 additions & 10 deletions
Large diffs are not rendered by default.

‎CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/be-fe-mono-repo-plain/ @clemensutschig
22
/be-gateway-nginx/ @gerardcl
3-
/be-golang-plain/ @michaelsauter @henrjk
3+
/be-golang-plain/ @henrjk
44
/be-java-springboot/ @stitakis @renedupont
55
/be-python-flask/ @buegelbeatz @henrjk @gerardcl
66
/be-rust-axum/ @gerardcl @flightlama
77
/be-scala-play/ @oalyman
88
/be-typescript-express/ @sino92
9-
/docker-plain/ @michaelsauter
9+
/docker-plain/
1010
/ds-jupyter-lab/ @gerardcl @hugowschneider
1111
/ds-rshiny/ @gerardcl
1212
/ds-streamlit/ @sklingel
@@ -17,5 +17,5 @@
1717
/inf-terraform-aws/ @terra-naut @tbugfinder
1818
/inf-terraform-azure/ @terra-naut @tbugfinder
1919
/ods-document-gen-svc/ @metmajer
20-
/ods-provisioning-app/ @clemensutschig @michaelsauter
21-
/release-manager/ @metmajer @michaelsauter
20+
/ods-provisioning-app/ @clemensutschig
21+
/release-manager/ @metmajer

‎be-fe-mono-repo-plain/files/docker_be/Dockerfile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# add /overwrite FROM with your base image, and do whatever you like here :)
2-
FROM alpine:latest
2+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
33

4-
RUN echo "building simple backend container"
4+
RUN echo "Building simple container"
55

6-
RUN apk update && \
7-
apk -i upgrade && \
8-
apk cache clean
6+
USER root
7+
8+
RUN microdnf -y update && \
9+
microdnf clean all
10+
11+
USER 1001
912

1013
EXPOSE 8081
1114

12-
CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8081 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
15+
CMD ["sh", "-c", "while true; do echo 'Container running on port 8081'; sleep 5; done"]

‎be-fe-mono-repo-plain/files/docker_fe/Dockerfile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# add /overwrite FROM with your base image, and do whatever you like here :)
2-
FROM alpine:latest
2+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
33

4-
RUN echo "building simple frontend container"
4+
RUN echo "Building simple container"
55

6-
RUN apk update && \
7-
apk -i upgrade && \
8-
apk cache clean
6+
USER root
7+
8+
RUN microdnf -y update && \
9+
microdnf clean all
10+
11+
USER 1001
912

1013
EXPOSE 8080
1114

12-
CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8080 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
15+
CMD ["sh", "-c", "while true; do echo 'Container running on port 8080'; sleep 5; done"]

‎be-gateway-nginx/files/docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://github.com/openresty/docker-openresty
2-
FROM openresty/openresty:1.25.3.2-0-rocky
2+
FROM openresty/openresty:1.27.1.1-1-rocky
33

44
ENV LANG=C.UTF-8
55

‎be-gateway-nginx/files/docker/nginx.conf‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ env YOUR_APP_SERVICE_PORT;
1313
# If using OIDC Lua module uncomment this
1414
# env SESSION_SECRET;
1515

16-
worker_processes auto;
16+
# set to 1 as we run the pod with less than a CPU core
17+
worker_processes 1;
18+
19+
# Enables the use of JIT for regular expressions to speed-up their processing.
20+
pcre_jit on;
1721

1822
events {
1923
worker_connections 1024;
@@ -87,9 +91,11 @@ http {
8791
# If using OIDC Lua module uncomment this (see 'env' related param at the beginning of this file)
8892
# set_by_lua $session_secret 'return os.getenv("SESSION_SECRET")';
8993

94+
# Don't reveal OpenResty version to clients.
95+
server_tokens off;
96+
9097
# modifying HTTP server signature header
9198
# more_set_headers "Server: Your App";
92-
server_tokens off;
9399

94100
# disable cache
95101
# expires 0;

‎be-golang-plain/files/docker/Dockerfile‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
1-
FROM alpine
2-
3-
# Uncomment this section if you need to use glibc in your container, f.e. when you enable CGO_ENABLED=1
4-
# Set locale
5-
#ENV LANG=C.UTF-8
6-
#
7-
# Install glibc so that CGO can be enabled when using dynamic linking
8-
#RUN apk add --no-cache --virtual .build-deps curl \
9-
# && GLIBC_VER="2.31-r0" \
10-
# && ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" \
11-
# && curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
12-
# && SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" \
13-
# && echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - \
14-
# && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk \
15-
# && apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk \
16-
# && curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk \
17-
# && apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk \
18-
# && curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk \
19-
# && apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk \
20-
# && /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 "$LANG" || true \
21-
# && echo "export LANG=$LANG" > /etc/profile.d/locale.sh \
22-
# && apk del --purge .build-deps glibc-i18n \
23-
# && rm -rf /tmp/*.apk /var/cache/apk/*
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
242

253
COPY app_linux_amd64 app_linux_amd64
264

27-
RUN apk update && \
28-
apk -i upgrade && \
29-
apk cache clean
5+
USER root
6+
7+
RUN microdnf -y update && \
8+
microdnf clean all
9+
10+
USER 1001
3011

3112
EXPOSE 8080
3213

‎be-java-springboot/templates/gradle-buildscript.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
nexus_url = project.findProperty('nexus_url') ?: System.getenv('NEXUS_HOST')
55
nexus_user = project.findProperty('nexus_user') ?: System.getenv('NEXUS_USERNAME')
66
nexus_pw = project.findProperty('nexus_pw') ?: System.getenv('NEXUS_PASSWORD')
7-
no_nexus = project.findProperty('no_nexus') ?: System.getenv('NO_NEXUS') ?: false
7+
no_nexus = (project.findProperty('no_nexus') ?: System.getenv('NO_NEXUS') ?: false).toBoolean()
88
if (!no_nexus && (nexus_url == null || nexus_user == null || nexus_pw == null)) {
99
throw new GradleException("property 'no_nexus' is set to false, but neither " +
1010
"'nexus_url', 'nexus_user' nor 'nexus_pw' is configured. You can do so " +

‎be-java-springboot/templates/gradle-repositories.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
if (!no_nexus) {
22
def nexusMaven = { repoUrl ->
3+
println("Setting up Nexus (${repoUrl}) as repo")
34
maven {
45
credentials {
56
username = "${nexus_user}"
@@ -11,5 +12,6 @@
1112
nexusMaven("${nexus_url}/repository/maven-public/")
1213
nexusMaven("${nexus_url}/repository/atlassian_public/")
1314
} else {
15+
println("Setting up mavenCentral as repo")
1416
mavenCentral()
1517
}

0 commit comments

Comments
 (0)