diff --git a/.drone.yml b/.drone.yml index 47a84a0..aa298c8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ name: default steps: - name: prepare-workdir - image: alpine:3.11.3 + image: alpine:3.13.1 commands: - mkdir canapeapp @@ -16,7 +16,7 @@ steps: - npm run-script build - name: backend - image: golang:1.14.0-alpine3.11 + image: golang:1.15.7-alpine3.13 commands: - apk --no-cache add git - GO111MODULE=off go get -tags 'postgres' -u github.com/golang-migrate/migrate/cmd/migrate @@ -24,7 +24,7 @@ steps: - CGO_ENABLED=0 go build -ldflags '-extldflags "-static"' -trimpath -v -o canapeapp/app backend/*.go - name: prepare-docker - image: alpine:3.11.3 + image: alpine:3.13.1 commands: - cp docker/run.sh canapeapp/run.sh - cp migrate canapeapp/migrate diff --git a/README.md b/README.md index d8b694a..0776ca4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ DB_DSN_DEV="postgres://test:test@127.0.0.1:5432/dev?sslmode=disable" ./dev.sh ba ## Connect to the database ```sh -docker run -it --rm -e PGPASSWORD=test --link canape_postgresql_dev:postgres postgres:9.5 psql -h postgres -U test -d dev +docker run -it --rm -e PGPASSWORD=test --link canape_postgresql_dev:postgres postgres:13.1 psql -h postgres -U test -d dev ``` ## Setup the dev users diff --git a/dev.sh b/dev.sh index e4f66e0..6eec775 100755 --- a/dev.sh +++ b/dev.sh @@ -128,7 +128,7 @@ case $1 in docker run -it --rm \ -e PGPASSWORD="$DB_PASS" \ --link canape_postgresql_dev:postgres \ - postgres:9.5 \ + postgres:13.1 \ psql -h postgres -U "$DB_USER" -d "$DB_DATABASE" ;; back) diff --git a/docker/Dockerfile-production b/docker/Dockerfile-production index 8e27a88..7ed83da 100644 --- a/docker/Dockerfile-production +++ b/docker/Dockerfile-production @@ -1,4 +1,4 @@ -FROM alpine:3.11.3 +FROM alpine:3.13.1 RUN apk --no-cache add ca-certificates COPY canapeapp /opt/canapeapp diff --git a/docker/docker-compose-prod.yml b/docker/docker-compose-prod.yml index bb863b4..2b67a5a 100644 --- a/docker/docker-compose-prod.yml +++ b/docker/docker-compose-prod.yml @@ -6,7 +6,7 @@ networks: services: database: - image: postgres:9.5 + image: postgres:13.1 container_name: canapeapp_database restart: always networks: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0413f89..6fb1083 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,5 @@ postgresql: - image: postgres:9.5 + image: postgres:13.1 container_name: canape_postgresql_dev restart: always environment: