Skip to content

Commit

Permalink
Deploy: FIx database creation
Browse files Browse the repository at this point in the history
  • Loading branch information
PierreGauthier committed Sep 10, 2024
1 parent 9fe2ce6 commit 5a826b8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy-int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
docker system prune -af &&
([[ $(docker volume ls -q | awk '!/_/' | wc -l) -eq 0 ]] || docker volume rm $(docker volume ls -q | awk '!/_/' | tr '\n' ' ')) &&
make .env &&
POSTGRES_PASSWORD=$POSTGRES_PASSWORD docker compose -f compose.yml -f compose.int.yml start database &&
docker compose -f compose.yml -f compose.int.yml down &&
git fetch --all && git reset --hard && git checkout ${{ env.back_branch }} &&
[ -d front/gally-admin ] || git clone https://github.com/Elastic-Suite/gally-admin.git front/gally-admin &&
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ jobs:
command: require gally/gally-premium:${{ env.composer_version }}
env:
COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
- name: Generate certificates
run: bash ./docker/generate-certs.sh
- name: Pull images
run: ${{env.docker_compose_cmd}} pull --ignore-pull-failures || true
- name: Start services
Expand Down Expand Up @@ -140,7 +138,7 @@ jobs:
file: api/coverage/coverage.xml
signature: "Backend Coverage of this branch"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: coverage-report
path: api/coverage/coverage.xml
Expand Down
6 changes: 3 additions & 3 deletions compose.int.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
services: # Todo upgrade : test inte
services:
router:
build:
context: ./docker/router
environment:
- EXAMPLE_UPSTREAM=example:3001
- EXAMPLE_UPSTREAM=pwa:3000

php:
environment:
Expand All @@ -15,4 +15,4 @@ services: # Todo upgrade : test inte
build:
target: gally_pwa_int
args:
public_url: https://${PWA_SERVER_NAME}/example
- public_url=https://${SERVER_NAME:-${PWA_SERVER_NAME:-gally.localhost}}/example
1 change: 0 additions & 1 deletion compose.override.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Development environment override
services:
# Todo upgrade: connect example app in router
router:
volumes:
- ./api/public:/app/public
Expand Down
3 changes: 2 additions & 1 deletion docker/front/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ EXPOSE 3001

WORKDIR /usr/src/front

ARG NEXT_PUBLIC_API_URL
ENV NEXT_PUBLIC_API_URL $NEXT_PUBLIC_API_URL
ENV NEXT_TELEMETRY_DISABLED 1

COPY --from=front_src . ./
Expand Down Expand Up @@ -77,7 +79,6 @@ CMD ["yarn", "dev"]
FROM gally_example_ci AS gally_example_dev

ENV WDS_SOCKET_PORT 443
ARG NEXT_PUBLIC_API_URL

RUN USER=node && \
GROUP=node && \
Expand Down

0 comments on commit 5a826b8

Please sign in to comment.