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

Jump to bottom

feat(baseImage): replace alpine with temurin as base image for running java applications #149

Merged
merged 1 commit into from
Mar 28, 2023
Merged

feat(baseImage): replace alpine with temurin as base image for running java applications #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/business-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Cache ContainerD Image Layers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Bump version in gradle.properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Import GPG Key
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Merge main back into develop and set new snapshot version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/veracode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Verify proper formatting
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Verify proper formatting
Expand All @@ -91,7 +91,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run Unit tests
Expand All @@ -108,7 +108,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run Integration tests
Expand All @@ -125,7 +125,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run API tests
Expand All @@ -142,7 +142,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run E2E tests
Expand All @@ -165,7 +165,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Cache SonarCloud packages
Expand Down
7 changes: 1 addition & 6 deletions edc-controlplane/edc-controlplane-memory-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.1

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down
7 changes: 1 addition & 6 deletions edc-controlplane/edc-controlplane-memory/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.2

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down
7 changes: 1 addition & 6 deletions edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.2

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down
7 changes: 1 addition & 6 deletions edc-controlplane/edc-controlplane-postgresql/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.2

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down
7 changes: 1 addition & 6 deletions edc-dataplane/edc-dataplane-azure-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.2

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down
7 changes: 1 addition & 6 deletions edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,12 @@ HEALTHCHECK NONE

RUN wget ${OTEL_AGENT_LOCATION} -O /tmp/opentelemetry-javaagent.jar

FROM alpine:3.17.2

FROM eclipse-temurin:11.0.18_10-jre-alpine
ARG JAR

ARG APP_USER=docker
ARG APP_UID=10100

RUN apk update && \
apk add openjdk11-jre-headless=11.0.18_p10-r0 --no-cache && \
rm -rf /var/cache/apk/*

RUN addgroup --system "$APP_USER"

RUN adduser \
Expand Down