Skip to content

Commit

Permalink
Fix Docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
wasdennnoch committed Dec 4, 2023
1 parent 35f314b commit 13d265e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/vanilla-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ jobs:
working-directory: ${{ env.WORKING_DIRECTORY }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: gradle/wrapper-validation-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log into Container registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.CONTAINER_REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Docker metadata
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: ${{ env.CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}
Expand All @@ -54,7 +54,7 @@ jobs:
org.opencontainers.image.description=The central cluster manager for Beemo.
- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
file: ${{ env.WORKING_DIRECTORY }}/Dockerfile
Expand Down
15 changes: 6 additions & 9 deletions vanilla/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
FROM gradle:7.4.2-jdk17-alpine AS build

WORKDIR /gradle/vanilla
WORKDIR /build/vanilla

COPY vanilla/build.gradle .
COPY vanilla/settings.gradle .
COPY vanilla/settings.gradle.kts .
COPY vanilla/build.gradle.kts .
COPY latte ../latte

RUN gradle downloadDependencies --no-daemon

COPY vanilla/src src

RUN gradle assemble installDist --no-daemon
RUN --mount=type=cache,target=/home/gradle/.gradle/caches gradle assemble installDist --no-daemon


FROM amazoncorretto:17-alpine3.15

WORKDIR /app
WORKDIR /vanilla

COPY --from=build /gradle/vanilla/build/install/vanilla/ .
COPY --from=build /build/vanilla/build/install/vanilla/ .

RUN addgroup -S -g 1337 vanilla && adduser -S -D -H -u 1337 -s /sbin/nologin -G vanilla vanilla
USER vanilla:vanilla
Expand Down
3 changes: 2 additions & 1 deletion vanilla/src/main/java/gg/beemo/vanilla/Vanilla.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ object Vanilla {

@JvmStatic
fun main(args: Array<String>) = runBlocking {
log.info("Starting vanilla")
log.debug("Loading configuration")
Configurator.create().mirror(Config::class.java)

log.debug("Initializing Kafka connection")
val brokerConnection = KafkaConnection(
Config.KAFKA_HOST,
CommonConfig.BrokerServices.VANILLA,
"0",
"0", // There will only ever be one instance of vanilla
Config.KAFKA_USE_TLS,
)

Expand Down

0 comments on commit 13d265e

Please sign in to comment.