Skip to content

Commit

Permalink
Merge branch 'main' of github.com:gruberdev/gaming
Browse files Browse the repository at this point in the history
  • Loading branch information
gruberdev committed Apr 5, 2024
2 parents cc2a9ae + c055e81 commit d1f17b2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 4 additions & 1 deletion servers/factorio/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM subchen/frep:1.3.13 as frep

FROM golang:1.22 as builder
FROM golang:1.22.2-bookworm as builder

WORKDIR /go/src/factorio
RUN apt-get update && apt-get install -y unzip curl
COPY . .

ENV CGO_ENABLED=0

RUN go mod tidy && go build -o wrapper .

FROM frolvlad/alpine-glibc:alpine-3.9
Expand Down
6 changes: 4 additions & 2 deletions servers/terraria/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM golang:1.22 as builder
FROM golang:1.22.2-bookworm as builder

# Update package lists and install unzip and curl
RUN apt-get update \
Expand All @@ -10,11 +10,13 @@ RUN apt-get update \
COPY . /go/src/terraria
WORKDIR /go/src/terraria

ENV CGO_ENABLED=0

# Tidy the Go module dependencies and build the wrapper binary
RUN go mod tidy && go build -o wrapper .

# Final image stage
FROM mono:slim
FROM golang:1.22.2-bookworm

# Add OCI annotations for the image
LABEL org.opencontainers.image.authors="gruberdev <[email protected]>"
Expand Down

0 comments on commit d1f17b2

Please sign in to comment.