Unverified Commit bc9556d2 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Dockerfile improvements. (#1135)

parent bfa69624

build/Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"$(git rev-parse --short HEAD)"



FROM golang:1.21.3-bullseye as builder

FROM golang:1.21.4-bookworm as builder



ARG commit

ARG version
@@ -34,7 +34,7 @@ WORKDIR /go/build/nakama 
RUN git checkout --quiet "$commit" && \

    go build -o /go/build-out/nakama -trimpath -mod=vendor -gcflags "-trimpath $PWD" -asmflags "-trimpath $PWD" -ldflags "-s -w -X main.version=$version -X main.commitID=$commit"



FROM debian:bullseye-slim

FROM debian:bookworm-slim



MAINTAINER Heroic Labs <support@heroiclabs.com>
@@ -47,7 +47,7 @@ LABEL description="Distributed server for social and realtime games and apps." 
RUN mkdir -p /nakama/data/modules && \

    apt-get update && \

    apt-get -y upgrade && \

    apt-get install -y --no-install-recommends ca-certificates=20210119 tzdata curl iproute2 unzip rsync git tini schroot && \

    apt-get install -y --no-install-recommends ca-certificates tzdata iproute2 tini && \

    apt-get clean && \

    rm -rf /var/lib/apt/lists/*
@@ -57,5 +57,5 @@ EXPOSE 7349 7350 7351 


ENTRYPOINT ["tini", "--", "/nakama/nakama"]



HEALTHCHECK --interval=5m --timeout=10s \

  CMD curl -f http://localhost:7350/ || exit 1
 
HEALTHCHECK --interval=30s --timeout=10s \

  CMD /nakama/nakama healthcheck || exit 1

build/Dockerfile.dsym

+5 −5
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
## See the License for the specific language governing permissions and

## limitations under the License.



# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v3.19.0 -t heroiclabs/nakama:3.19.0

# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v3.19.0-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"3.19.0-$(git rev-parse --short HEAD)"



FROM golang:1.21.3-bullseye as builder
@@ -47,7 +47,7 @@ LABEL description="Distributed server for social and realtime games and apps." 
RUN mkdir -p /nakama/data/modules && \

    apt-get update && \

    apt-get -y upgrade && \

    apt-get install -y --no-install-recommends ca-certificates=20210119 tzdata curl iproute2 unzip rsync git tini schroot && \

    apt-get install -y --no-install-recommends ca-certificates tzdata iproute2 tini && \

    apt-get clean && \

    rm -rf /var/lib/apt/lists/*
@@ -57,5 +57,5 @@ EXPOSE 7349 7350 7351 


ENTRYPOINT ["tini", "--", "/nakama/nakama"]



HEALTHCHECK --interval=5m --timeout=10s \

  CMD curl -f http://localhost:7350/ || exit 1
 
HEALTHCHECK --interval=30s --timeout=10s \

  CMD /nakama/nakama healthcheck || exit 1

build/Dockerfile.local

0 → 100644
+57 −0
Original line number Diff line number Diff line 
## Copyright 2018 The Nakama Authors

##

## Licensed under the Apache License, Version 2.0 (the "License");

## you may not use this file except in compliance with the License.

## You may obtain a copy of the License at

##

## http://www.apache.org/licenses/LICENSE-2.0

##

## Unless required by applicable law or agreed to in writing, software

## distributed under the License is distributed on an "AS IS" BASIS,

## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

## See the License for the specific language governing permissions and

## limitations under the License.



# docker build .. -f Dockerfile.local -t heroiclabs/nakama-dev



FROM golang:1.21.4-bookworm as builder



ENV GOOS linux

ENV GOARCH amd64

ENV CGO_ENABLED 1



RUN apt-get update && \

    apt-get -y upgrade && \

    apt-get install -y --no-install-recommends ca-certificates gcc libc6-dev



WORKDIR /go/build/nakama



COPY . .



RUN go build -o /go/build-out/nakama -trimpath -mod=vendor -gcflags "-trimpath $PWD" -asmflags "-trimpath $PWD" -ldflags "-s -w -X main.version=local"



FROM debian:bookworm-slim



MAINTAINER Heroic Labs <support@heroiclabs.com>



ARG version



LABEL version=$version

LABEL variant=nakama

LABEL description="Distributed server for social and realtime games and apps."



RUN mkdir -p /nakama/data/modules && \

    apt-get update && \

    apt-get -y upgrade && \

    apt-get install -y --no-install-recommends ca-certificates tzdata iproute2 tini && \

    apt-get clean && \

    rm -rf /var/lib/apt/lists/*



WORKDIR /nakama/

COPY --from=builder "/go/build-out/nakama" /nakama/

EXPOSE 7349 7350 7351



ENTRYPOINT ["tini", "--", "/nakama/nakama"]



HEALTHCHECK --interval=30s --timeout=10s \

  CMD /nakama/nakama healthcheck || exit 1

docker-compose-postgres.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ services: 
      retries: 5

  nakama:

    container_name: nakama

    image: registry.heroiclabs.com/heroiclabs/nakama:3.18.0

    image: registry.heroiclabs.com/heroiclabs/nakama:3.19.0

    entrypoint:

      - "/bin/sh"

      - "-ecx"
@@ -45,7 +45,7 @@ services: 
      - "7350:7350"

      - "7351:7351"

    healthcheck:

      test: ["CMD", "curl", "-f", "http://localhost:7350/"]

      test: ["CMD", "/nakama/nakama", "healthcheck"]

      interval: 10s

      timeout: 5s

      retries: 5

docker-compose.yml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ services: 
      timeout: 3s

      retries: 5

  nakama:

    image: registry.heroiclabs.com/heroiclabs/nakama:3.18.0

    image: registry.heroiclabs.com/heroiclabs/nakama:3.19.0

    entrypoint:

      - "/bin/sh"

      - "-ecx"
@@ -45,7 +45,7 @@ services: 
      - "7350:7350"

      - "7351:7351"

    healthcheck:

      test: ["CMD", "curl", "-f", "http://localhost:7350/"]

      test: ["CMD", "/nakama/nakama", "healthcheck"]

      interval: 10s

      timeout: 5s

      retries: 5