Skip to content

Commit

Permalink
build(docker): bump node to 18.18.2, golang to 1.21.3 and apline to 3.18
Browse files Browse the repository at this point in the history
  • Loading branch information
genshen committed Oct 20, 2023
1 parent 8e7bcf7 commit 755869a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# build method: just run `docker build --rm -t genshen/wssocks .`

# build frontend code
FROM node:14.15.4-alpine3.12 AS web-builder
FROM node:18.18.2-alpine3.18 AS web-builder

COPY status-web web/

Expand All @@ -10,15 +10,15 @@ RUN cd web \
&& yarn build

## build go binary
FROM golang:1.15.7-alpine3.13 AS builder
FROM golang:1.21.3-alpine3.18 AS builder

ARG PACKAGE=github.com/genshen/wssocks
ARG BUILD_FLAG="-X 'github.com/genshen/wssocks/version.buildHash=`git rev-parse HEAD`' \
-X 'github.com/genshen/wssocks/version.buildTime=`date`' \
-X 'github.com/genshen/wssocks/version.buildGoVersion=`go version | cut -f 3,4 -d\" \"`'"

RUN apk add --no-cache git \
&& go get -u github.com/rakyll/statik
&& go install github.com/rakyll/statik@v0.1.7

COPY ./ /go/src/${PACKAGE}/
COPY --from=web-builder web/build /go/src/github.com/genshen/wssocks/web-build/
Expand All @@ -31,7 +31,7 @@ RUN cd ./src/${PACKAGE} \
&& go install

## copy binary
FROM alpine:3.13.0
FROM alpine:3.18.0

ARG HOME="/home/wssocks"

Expand Down

0 comments on commit 755869a

Please sign in to comment.