diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000..0645cc3 --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,28 @@ +version: '3' + +vars: + API_IMAGE_NAME: realz + API_IMAGE_VERSION: v1.0.0 + DB_IMAGE_NAME: realzdb + DB_IMAGE_VERSION: v1.0.0 + +tasks: + default: + deps: [ build ] + silent: true + + build-api: + desc: Construction de l'image Docker realz API + cmds: + - docker build -t {{.API_IMAGE_NAME}}:{{.API_IMAGE_VERSION}} -t {{.API_IMAGE_NAME}}:latest -f docker/Dockerfile.api . + silent: true + + build-db: + desc: Construction de l'image Docker realz DB + cmds: + - docker build -t {{.DB_IMAGE_NAME}}:{{.DB_IMAGE_VERSION}} -t {{.DB_IMAGE_NAME}}:latest -f docker/Dockerfile.db . + silent: true + + build: + desc: Construction des images Docker realz + deps: [ build-api, build-db ] diff --git a/config.yaml b/config.yaml index 22ccf26..c6d0da8 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ server: - address: "0.0.0.0:8080" + address: "0.0.0.0:8088" database: user: "realz" diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api new file mode 100644 index 0000000..d52e0ad --- /dev/null +++ b/docker/Dockerfile.api @@ -0,0 +1,13 @@ +FROM golang:latest AS builder +ARG CGO_ENABLED=0 +WORKDIR /app + +COPY go.mod go.sum ./ +RUN go mod download +COPY . . + +RUN go build + +FROM scratch +COPY --from=builder /app/realz /realz +ENTRYPOINT ["/realz"] \ No newline at end of file diff --git a/docker/Dockerfile.db b/docker/Dockerfile.db index ae42205..7f9c6cb 100644 --- a/docker/Dockerfile.db +++ b/docker/Dockerfile.db @@ -7,6 +7,6 @@ RUN apk add --no-cache gdal gdal-tools gdal-driver-PG # Exposer le port par défaut de PostgreSQL EXPOSE 5432 -COPY scripts/init-db.sh /docker-entrypoint-initdb.d/init-db.sh -COPY data/RAF20_lambert93.tiff /opt/RAF20_lambert93.tiff +COPY docker/scripts/init-db.sh /docker-entrypoint-initdb.d/init-db.sh +COPY docker/data/RAF20_lambert93.tiff /opt/RAF20_lambert93.tiff RUN chmod +x /docker-entrypoint-initdb.d/init-db.sh diff --git a/docker/compose.yaml b/docker/compose.yaml index 133c6b2..deb4033 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -1,13 +1,4 @@ services: - api: - image: postgrest/postgrest - ports: - - "3300:3000" - environment: - PGRST_DB_URI: postgres://${PGRST_AUTHUSER}:${PGRST_PASSWORD}@postgis:5432 - PGRST_DB_SCHEMAS: raf20lambert93 - PGRST_DB_ANON_ROLE: web_anon - PGRST_OPENAPI_SERVER_PROXY_URI: http://127.0.0.1:3000 postgis: image: realz container_name: postgis_initialized diff --git a/index.html b/index.html index 63a4982..45197bb 100644 --- a/index.html +++ b/index.html @@ -62,6 +62,7 @@ @@ -70,6 +71,7 @@