Skip to content

Commit

Permalink
chore(ci): consolidate oracle-api and common containers (#1512)
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Aug 15, 2024
1 parent a040157 commit 6949d07
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 622 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
package: [backend, common, database, frontend, oracle-api, sync]
package: [backend, database, frontend, oracle-api, sync]
steps:
- uses: shrink/actions-docker-registry-tag@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
with:
cleanup: label
packages: database backend frontend oracle-api sync common
packages: database backend frontend oracle-api sync

2 changes: 1 addition & 1 deletion .github/workflows/pr-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
packages: write
strategy:
matrix:
package: [database, common, backend, frontend, oracle-api, sync]
package: [database, backend, frontend, oracle-api, sync]
steps:
- uses: bcgov-nr/[email protected]
id: build
Expand Down
20 changes: 0 additions & 20 deletions common/Dockerfile

This file was deleted.

67 changes: 0 additions & 67 deletions oracle-api/.eslintrc.json

This file was deleted.

25 changes: 0 additions & 25 deletions oracle-api/CHANGELOG.md

This file was deleted.

132 changes: 0 additions & 132 deletions oracle-api/CODE_OF_CONDUCT.md

This file was deleted.

11 changes: 0 additions & 11 deletions oracle-api/COMPLIANCE.yaml

This file was deleted.

11 changes: 5 additions & 6 deletions oracle-api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ FROM ghcr.io/graalvm/native-image:22.3.3 AS build

# Copy
WORKDIR /app
COPY pom.xml mvnw ./
COPY src ./src
COPY .mvn/ ./.mvn
COPY InstallCert.java .
COPY . ./

# Build
RUN ./mvnw package -Pnative -DskipTests -Dskip.unit.tests=true && \
javac InstallCert.java
javac InstallCert.java

### Deployer

### Deployer
FROM eclipse-temurin:17.0.11_9-jdk-jammy AS deploy

# Java vars
Expand All @@ -23,6 +21,7 @@ ENV LC_ALL=en_CA.UTF-8
WORKDIR /app
COPY --from=build /app/target/nr-spar-oracle-api ./nr-spar-oracle-api
COPY --from=build /app/*.class ./artifacts/
COPY --from=build /app/install_cert.sh ./

# User, port and healthcheck
USER 1001
Expand Down
Loading

0 comments on commit 6949d07

Please sign in to comment.