diff --git a/app/data/compose/docker-compose-laconic-explorer-test.yml b/app/data/compose/docker-compose-laconic-explorer-test.yml new file mode 100644 index 00000000..b5fcce4e --- /dev/null +++ b/app/data/compose/docker-compose-laconic-explorer-test.yml @@ -0,0 +1,13 @@ +version: '3.8' + +services: + laconic-explorer: + image: cerc/laconic-explorer:local + #env_file: + #- ../config/laconic-explorer/TODO? + #volumes: + #- ../config/keycloak/import:/import + ports: + - "8080:8080" + # command: ["yarn serve"] + stdin_open: true diff --git a/app/data/compose/docker-compose-laconic-explorer.yml b/app/data/compose/docker-compose-laconic-explorer.yml index 10319bf1..ad56eea6 100644 --- a/app/data/compose/docker-compose-laconic-explorer.yml +++ b/app/data/compose/docker-compose-laconic-explorer.yml @@ -1,7 +1,22 @@ -version: "3.2" +version: '3.8' + services: - laconicd: - restart: unless-stopped + laconic-explorer: image: cerc/laconic-explorer:local + #env_file: + #- ../config/laconic-explorer/TODO? + #volumes: + #- ../config/keycloak/import:/import ports: - - "1317" + - "8080:8080" + command: ["yarn serve"] + depends_on: + explorer-nginx: + condition: service_healthy + explorer-nginx: + image: nginx:1.23-alpine + restart: always + volumes: + - ../config/laconic-explorer/default.conf:/etc/nginx/conf.d/default.conf + ports: + - "80:80" diff --git a/app/data/config/nginx/default.conf b/app/data/config/laconic-explorer/default.conf similarity index 100% rename from app/data/config/nginx/default.conf rename to app/data/config/laconic-explorer/default.conf diff --git a/app/data/container-build/cerc-laconic-explorer/Dockerfile b/app/data/container-build/cerc-laconic-explorer/Dockerfile index b66b75a2..2f84a73d 100644 --- a/app/data/container-build/cerc-laconic-explorer/Dockerfile +++ b/app/data/container-build/cerc-laconic-explorer/Dockerfile @@ -4,7 +4,7 @@ FROM node:16.17.1-alpine3.16 RUN apk --update --no-cache add git python3 alpine-sdk -WORKDIR /app +WORKDIR / COPY . . @@ -12,4 +12,6 @@ RUN echo "Building Laconic Explorer" && \ git checkout master && \ yarn -CMD ["yarn serve"] +EXPOSE 8080 + +CMD ["yarn", "serve"] diff --git a/app/data/container-build/cerc-laconic-explorer/build.sh b/app/data/container-build/cerc-laconic-explorer/build.sh old mode 100644 new mode 100755 diff --git a/app/data/container-build/cerc-nginx/build.sh b/app/data/container-build/cerc-nginx/build.sh old mode 100644 new mode 100755