Skip to content

Commit

Permalink
Go 1.21 & Alpine 3.18 update (#136)
Browse files Browse the repository at this point in the history
  • Loading branch information
Shpota committed Sep 9, 2023
1 parent 877c0db commit 147c621
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Go 1.20
- name: Set up go 1.21
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
id: go
- name: Build
run: go build .
Expand All @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [ 1.11, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.19 ]
go: [ '1.11', '1.12', '1.13', '1.14', '1.15', '1.16', '1.17', '1.18', '1.19', '1.20' ]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
- name: Generate application
run: go run main.go init --db ${{ matrix.db }} --frontend ${{ matrix.frontend }} app
- name: Start the application
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/shpota/goxygen

go 1.20
go 1.21
28 changes: 14 additions & 14 deletions static/generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions templates/mongo.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM node:16.18.1-alpine3.16 AS JS_BUILD
FROM node:16.20-alpine3.18 AS JS_BUILD
COPY webapp /webapp
WORKDIR /webapp
RUN npm install && npm run build

FROM golang:1.20-alpine3.16 AS GO_BUILD
FROM golang:1.21.1-alpine3.18 AS GO_BUILD
RUN apk update && apk add build-base
COPY server /server
WORKDIR /server
RUN go build -o /go/bin/server

FROM alpine:3.16.3
FROM alpine:3.18.3
COPY --from=JS_BUILD /webapp/build* ./webapp/
COPY --from=GO_BUILD /go/bin/server ./
CMD ./server
2 changes: 1 addition & 1 deletion templates/mongo.server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module project-name

go 1.20
go 1.21

require go.mongodb.org/mongo-driver v1.12.0

Expand Down
6 changes: 3 additions & 3 deletions templates/mysql.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM node:16.18.1-alpine3.16 AS JS_BUILD
FROM node:16.20-alpine3.18 AS JS_BUILD
COPY webapp /webapp
WORKDIR /webapp
RUN npm install && npm run build

FROM golang:1.20-alpine3.16 AS GO_BUILD
FROM golang:1.21.1-alpine3.18 AS GO_BUILD
COPY server /server
WORKDIR /server
RUN go build -o /go/bin/server

FROM alpine:3.16.3
FROM alpine:3.18.3
COPY --from=JS_BUILD /webapp/build* ./webapp/
COPY --from=GO_BUILD /go/bin/server ./
CMD ./server
2 changes: 1 addition & 1 deletion templates/mysql.server/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module project-name

go 1.20
go 1.21

require github.com/go-sql-driver/mysql v1.7.1
6 changes: 3 additions & 3 deletions templates/postgres.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM node:16.18.1-alpine3.16 AS JS_BUILD
FROM node:16.20-alpine3.18 AS JS_BUILD
COPY webapp /webapp
WORKDIR /webapp
RUN npm install && npm run build

FROM golang:1.20-alpine3.16 AS GO_BUILD
FROM golang:1.21.1-alpine3.18 AS GO_BUILD
COPY server /server
WORKDIR /server
RUN go build -o /go/bin/server

FROM alpine:3.16.3
FROM alpine:3.18.3
COPY --from=JS_BUILD /webapp/build* ./webapp/
COPY --from=GO_BUILD /go/bin/server ./
CMD ./server
2 changes: 1 addition & 1 deletion templates/postgres.docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.8"
services:
dev_db:
image: postgres:15.1-alpine3.17
image: postgres:15.4-alpine3.18
environment:
POSTGRES_PASSWORD: pass
POSTGRES_USER: goxygen
Expand Down
2 changes: 1 addition & 1 deletion templates/postgres.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
profile: prod
db_pass: pass
db:
image: postgres:15.1-alpine3.17
image: postgres:15.4-alpine3.18
environment:
POSTGRES_PASSWORD: pass
POSTGRES_USER: goxygen
Expand Down
2 changes: 1 addition & 1 deletion templates/postgres.server/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module project-name

go 1.20
go 1.21

require github.com/lib/pq v1.10.9
2 changes: 1 addition & 1 deletion transform/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/shpota/goxygen/transform

go 1.20
go 1.21

0 comments on commit 147c621

Please sign in to comment.