updates #40

Merged
PouuleT merged 2 commits from updates into master 2021-02-03 15:33:28 +00:00
6 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@ name: default
steps: steps:
- name: prepare-workdir - name: prepare-workdir
image: alpine:3.11.3 image: alpine:3.13.1
commands: commands:
- mkdir canapeapp - mkdir canapeapp
@ -16,7 +16,7 @@ steps:
- npm run-script build - npm run-script build
- name: backend - name: backend
image: golang:1.14.0-alpine3.11 image: golang:1.15.7-alpine3.13
commands: commands:
- apk --no-cache add git - apk --no-cache add git
- GO111MODULE=off go get -tags 'postgres' -u github.com/golang-migrate/migrate/cmd/migrate - 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 - CGO_ENABLED=0 go build -ldflags '-extldflags "-static"' -trimpath -v -o canapeapp/app backend/*.go
- name: prepare-docker - name: prepare-docker
image: alpine:3.11.3 image: alpine:3.13.1
commands: commands:
- cp docker/run.sh canapeapp/run.sh - cp docker/run.sh canapeapp/run.sh
- cp migrate canapeapp/migrate - cp migrate canapeapp/migrate

View File

@ -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 ## Connect to the database
```sh ```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 ## Setup the dev users

2
dev.sh
View File

@ -128,7 +128,7 @@ case $1 in
docker run -it --rm \ docker run -it --rm \
-e PGPASSWORD="$DB_PASS" \ -e PGPASSWORD="$DB_PASS" \
--link canape_postgresql_dev:postgres \ --link canape_postgresql_dev:postgres \
postgres:9.5 \ postgres:13.1 \
psql -h postgres -U "$DB_USER" -d "$DB_DATABASE" psql -h postgres -U "$DB_USER" -d "$DB_DATABASE"
;; ;;
back) back)

View File

@ -1,4 +1,4 @@
FROM alpine:3.11.3 FROM alpine:3.13.1
RUN apk --no-cache add ca-certificates RUN apk --no-cache add ca-certificates
COPY canapeapp /opt/canapeapp COPY canapeapp /opt/canapeapp

View File

@ -6,7 +6,7 @@ networks:
services: services:
database: database:
image: postgres:9.5 image: postgres:13.1
container_name: canapeapp_database container_name: canapeapp_database
restart: always restart: always
networks: networks:

View File

@ -1,5 +1,5 @@
postgresql: postgresql:
image: postgres:9.5 image: postgres:13.1
container_name: canape_postgresql_dev container_name: canape_postgresql_dev
restart: always restart: always
environment: environment: