Skip to content

Commit

Permalink
issue #66: added ARG and ENV inside dockerfile + redirect previous UR…
Browse files Browse the repository at this point in the history
…L and removed old workflows
  • Loading branch information
ThomasCardin committed Jan 24, 2024
1 parent 0b813af commit dc44b05
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 49 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/build-push-docker.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/github-workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Workflows

on:
pull_request:
types:
- opened
- closed
- synchronize

jobs:
lint-test:
uses: ai-cfia/github-workflows/.github/workflows/workflow-lint-test-node.yml@main

markdown-check:
uses: ai-cfia/github-workflows/.github/workflows/workflow-markdown-check.yml@main
with:
config-file-path: '.mlc_config.json'
secrets: inherit

repo-standard:
uses: ai-cfia/github-workflows/.github/workflows/workflow-repo-standards-validation.yml@main
secrets: inherit

build-and-push-gcr:
uses: ai-cfia/github-workflows/.github/workflows/workflow-build-push-container-github-registry.yml@63-as-a-devops-i-would-like-to-create-a-workflow-to-push-images-to-this-organisation-docker-registry
with:
container-name: ${{ github.event.repository.name }}
tag: ${{ github.sha }}
registry: ghcr.io/ai-cfia
secrets: inherit
28 changes: 0 additions & 28 deletions .github/workflows/vercel-deployment.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .mlc_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"aliveStatusCodes": [999,200,403]
}
13 changes: 9 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@ FROM node:18.16.0-alpine AS build

WORKDIR /code

ARG REACT_APP_BACKEND_URL
ARG REACT_APP_DEBUG_MODE
ARG REACT_APP_GITHUB_API_URL
ARG REACT_APP_SEARCH_SOURCE
ARG ARG_REACT_APP_BACKEND_URL
ARG ARG_REACT_APP_DEBUG_MODE
ARG ARG_REACT_APP_GITHUB_API_URL
ARG ARG_REACT_APP_SEARCH_SOURCE

ENV REACT_APP_BACKEND_URL=${ARG_REACT_APP_BACKEND_URL:-https://finesse.ninebasetwo.xyz/api}
ENV REACT_APP_DEBUG_MODE=${ARG_REACT_APP_DEBUG_MODE:-True}
ENV REACT_APP_GITHUB_API_URL=${ARG_REACT_APP_GITHUB_API_URL:-https://api.github.com/repos/ai-cfia/finesse-data/contents}
ENV REACT_APP_SEARCH_SOURCE=${ARG_REACT_APP_SEARCH_SOURCE:-azure}

COPY ./src ./src
COPY ./public ./public
Expand Down
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="refresh" content="0; URL='https://finesse.ninebasetwo.xyz/'"/>
<meta name="theme-color" content="#000000" />
<meta name="CFIA/ACIA Finesse Search" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
Expand Down

0 comments on commit dc44b05

Please sign in to comment.