Skip to content

Commit

Permalink
Merge pull request #979 from NBISweden/fix-docker-builds
Browse files Browse the repository at this point in the history
Bump gcc version and use Alpine 3.20 base image
  • Loading branch information
kusalananda authored Sep 6, 2024
2 parents 74cdf34 + d88a410 commit 6024ab1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine3.18
FROM golang:1.23-alpine3.20

ENV XDG_CACHE_HOME='/tmp/.cache'

Expand All @@ -8,7 +8,7 @@ SHELL ["/bin/ash", "-o", "pipefail", "-c"]

RUN apk --no-cache add \
'curl=~8' \
'gcc=~12' \
'gcc=~13' \
'musl-dev=~1.2'; \
curl --silent --fail --location \
'https://raw.githubusercontent.com/cosmtrek/air/v1.44.0/install.sh' | \
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3"

services:

Expand Down
2 changes: 1 addition & 1 deletion node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.3.0-alpine as build
FROM node:20.3.0-alpine AS build

USER node
RUN mkdir /home/node/app
Expand Down
4 changes: 2 additions & 2 deletions production/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine as builder
FROM golang:1.23-alpine3.20 AS builder

RUN addgroup -S urdr && getent group urdr >/tmp/group
RUN adduser -S urdr && getent passwd urdr >/tmp/passwd
Expand All @@ -8,7 +8,7 @@ WORKDIR /go
COPY ./ .

RUN apk --no-cache add \
'gcc=~12' \
'gcc=~13' \
'musl-dev=~1.2'

ENV GOPATH=$PWD
Expand Down
1 change: 0 additions & 1 deletion production/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3"

services:

Expand Down

0 comments on commit 6024ab1

Please sign in to comment.