diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 10f315adb..fc4fc373c 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -30,9 +30,10 @@ jobs: sed -i "s/^SERVICE_MONGODB_USER=.*$/SERVICE_MONGODB_USER=$SERVICE_USERNAME/" $ENV_FILE sed -i "s/^SERVICE_MONGODB_PASSWORD=.*$/SERVICE_MONGODB_PASSWORD=$SERVICE_PASSWORD/" $ENV_FILE sed -i "s/^MARKET_GITHUB_TOKEN=.*$/MARKET_GITHUB_TOKEN=$GH_TOKEN/" $ENV_FILE + sed -i "s/^MARKETPLACE_INSTALLATION_URL=.*$/MARKETPLACE_INSTALLATION_URL=dummy/" $ENV_FILE - name: Refresh Docker images working-directory: ./marketplace-build run: | docker compose down - docker compose -f docker-compose.yml up -d + docker compose up -d diff --git a/marketplace-build/.env b/marketplace-build/.env index e2ca21cd2..8f0271811 100644 --- a/marketplace-build/.env +++ b/marketplace-build/.env @@ -4,4 +4,5 @@ SERVICE_MONGODB_HOST= SERVICE_MONGODB_USER= SERVICE_MONGODB_PASSWORD= SERVICE_MONGODB_DATABASE= -MARKET_GITHUB_TOKEN= \ No newline at end of file +MARKET_GITHUB_TOKEN= +MARKETPLACE_INSTALLATION_URL= \ No newline at end of file diff --git a/marketplace-build/docker-compose.yml b/marketplace-build/docker-compose.yml index df25280df..e3f864ead 100644 --- a/marketplace-build/docker-compose.yml +++ b/marketplace-build/docker-compose.yml @@ -40,6 +40,7 @@ services: - MONGODB_USERNAME=${SERVICE_MONGODB_USER} - MONGODB_PASSWORD=${SERVICE_MONGODB_PASSWORD} - MARKET_GITHUB_TOKEN=${MARKET_GITHUB_TOKEN} + - MARKETPLACE_INSTALLATION_URL=${MARKETPLACE_INSTALLATION_URL} build: context: ../marketplace-service dockerfile: Dockerfile diff --git a/marketplace-ui/Dockerfile b/marketplace-ui/Dockerfile index e7e6dcee2..e02ed0f60 100644 --- a/marketplace-ui/Dockerfile +++ b/marketplace-ui/Dockerfile @@ -8,4 +8,4 @@ RUN npm run build --prod # Stage 2: Serve Angular app using Nginx FROM nginx:alpine COPY --from=build-angular /app/dist/browser /usr/share/nginx/html -COPY --from=assets ./config/nginx/nginx.conf /etc/nginx/nginx.conf +COPY --from=assets config/nginx/nginx.conf /etc/nginx/nginx.conf diff --git a/marketplace-ui/nginx.conf b/marketplace-ui/nginx.conf deleted file mode 100644 index bd3cc2b35..000000000 --- a/marketplace-ui/nginx.conf +++ /dev/null @@ -1,27 +0,0 @@ -# the events block is required -events{} - -http { - # include the default mime.types to map file extensions to MIME types - include /etc/nginx/mime.types; - - server { - # set the root directory for the server (we need to copy our - # application files here) - root /usr/share/nginx/html; - - # set the default index file for the server (Angular generates the - # index.html file for us and it will be in the above directory) - index index.html; - - # specify the configuration for the '/' location - location / { - # try to serve the requested URI. if that fails then try to - # serve the URI with a trailing slash. if that fails, then - # serve the index.html file; this is needed in order to serve - # Angular routes--e.g.,'localhost:8080/customer' will serve - # the index.html file - try_files $uri $uri/ /index.html; - } - } -}