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

Update OS packages by default in all Quickstarters and bump gitleaks version #1055

Merged
merged 13 commits into from
Sep 5, 2024
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049))
- Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033))
- Update Rust Axum Quickstarter to Rust 1.79.0 ([#1024](https://github.com/opendevstack/ods-quickstarters/pull/1024))
- Update jdk and scala quickstarters and agents ([#1032](https://github.com/opendevstack/ods-quickstarters/issues/1032))
Expand Down
2 changes: 1 addition & 1 deletion be-fe-mono-repo-plain/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions be-fe-mono-repo-plain/files/docker_be/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ FROM alpine:latest

RUN echo "building simple backend container"

RUN apk update && \
apk -i upgrade && \
apk cache clean

EXPOSE 8081

CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8081 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
4 changes: 4 additions & 0 deletions be-fe-mono-repo-plain/files/docker_fe/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ FROM alpine:latest

RUN echo "building simple frontend container"

RUN apk update && \
apk -i upgrade && \
apk cache clean

EXPOSE 8080

CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8080 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
2 changes: 1 addition & 1 deletion be-gateway-nginx/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
3 changes: 3 additions & 0 deletions be-gateway-nginx/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ COPY lua /usr/local/openresty/lualib
COPY nginx.conf /usr/local/openresty/nginx/conf/
COPY entrypoint.sh /app/

RUN dnf upgrade -y && \
dnf clean all

RUN chgrp -R 0 /app /usr/local/openresty/nginx && \
chmod -R g=u /app /usr/local/openresty/nginx && \
chmod +x /app/entrypoint.sh && \
Expand Down
2 changes: 1 addition & 1 deletion be-golang-plain/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions be-golang-plain/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ FROM alpine

COPY app_linux_amd64 app_linux_amd64

RUN apk update && \
apk -i upgrade && \
apk cache clean

EXPOSE 8080

CMD ["./app_linux_amd64"]
2 changes: 1 addition & 1 deletion be-java-springboot/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
7 changes: 7 additions & 0 deletions be-java-springboot/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true

COPY app.jar app.jar

USER root

RUN microdnf upgrade -y && \
microdnf clean all

USER 1001

EXPOSE 8080

CMD ["java","-Xmx512m", "-jar", "app.jar"]
2 changes: 1 addition & 1 deletion be-python-flask/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
7 changes: 7 additions & 0 deletions be-python-flask/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ COPY run.sh /app/

WORKDIR /app

USER root

RUN yum -y update && \
yum clean all

USER 1001

RUN if [ ! -z ${nexusHostWithBasicAuth} ]; \
then pip install -i ${nexusHostWithBasicAuth}/repository/pypi-all/simple --trusted-host ${nexusHostWithoutScheme} --upgrade pip && pip install -i ${nexusHostWithBasicAuth}/repository/pypi-all/simple --trusted-host ${nexusHostWithoutScheme} -r requirements.txt; \
else pip install --upgrade pip && pip install -r requirements.txt; \
Expand Down
2 changes: 1 addition & 1 deletion be-rust-axum/rust-template/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion be-scala-play/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
7 changes: 7 additions & 0 deletions be-scala-play/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ WORKDIR /app
COPY lib/* /app/lib/
COPY conf /app/conf/

USER root

RUN microdnf upgrade -y && \
microdnf clean all

USER 1001

EXPOSE 8080

ENTRYPOINT ["java", "-Duser.dir=/app", "-XX:+UnlockExperimentalVMOptions", "-cp", "conf/:lib/*"]
Expand Down
2 changes: 1 addition & 1 deletion be-typescript-express/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions be-typescript-express/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ FROM node:22-alpine

COPY dist /node

RUN apk update && \
apk -i upgrade && \
apk cache clean

RUN chown -R node: /node

EXPOSE 8080
Expand Down
2 changes: 1 addition & 1 deletion docker-plain/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions docker-plain/files/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ FROM alpine:latest

RUN echo "building simple container"

RUN apk update && \
apk -i upgrade && \
apk cache clean

EXPOSE 8080

CMD ["/bin/sh", "-c", "/usr/bin/nc -lk -p 8080 -e echo -e \"HTTP/1.1 200 OK\n\nHello World!\n$(date)\""]
2 changes: 1 addition & 1 deletion ds-jupyter-lab/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion ds-rshiny/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion ds-streamlit/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
3 changes: 3 additions & 0 deletions ds-streamlit/files/docker_streamlit/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ USER root
RUN mkdir -p /app && \
mkdir -p /app/.streamlit

RUN yum -y update && \
yum clean all

RUN chown -R 1001:0 /app && \
chmod -R g=u /app

Expand Down
2 changes: 1 addition & 1 deletion e2e-cypress/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion e2e-spock-geb/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion fe-angular/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions fe-angular/files/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
FROM nginx:1.27.1-alpine

RUN apk update && \
apk -i upgrade && \
apk cache clean

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
&& chmod -R g+rwX /etc/nginx
Expand Down
2 changes: 1 addition & 1 deletion fe-ionic/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
4 changes: 4 additions & 0 deletions fe-ionic/files/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
FROM nginx:1.27.1-alpine

RUN apk update && \
apk -i upgrade && \
apk cache clean

RUN chmod -R 777 /var/log/nginx /var/cache/nginx /var/run \
&& chgrp -R 0 /etc/nginx \
&& chmod -R g+rwX /etc/nginx
Expand Down
2 changes: 1 addition & 1 deletion inf-terraform-aws/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fail_fast: true

repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
- repo: https://github.com/pre-commit/pre-commit-hooks.git
Expand Down
2 changes: 1 addition & 1 deletion inf-terraform-azure/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude: .terraform
fail_fast: true
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
- repo: https://github.com/pre-commit/pre-commit-hooks.git
Expand Down
2 changes: 1 addition & 1 deletion release-manager/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks
2 changes: 1 addition & 1 deletion saas-documentation/files/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repos:
- repo: https://github.com/gitleaks/gitleaks
rev: v8.16.1
rev: v8.18.4
hooks:
- id: gitleaks