Merge pull request #7 from YTVanced/dev

Testing API url from build args

.dockerignore

@@ -1,5 +1,6 @@
 node_modules
 .dockerignore
+.env
 Dockerfile
 .github
 coverage

.github/workflows/dev-ci.yml

@@ -28,7 +28,9 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: vanced/website-v2:dev-${{ env.RELEASE_VERSION }}
+          tags: vanced/website-v2:dev-${{ env.RELEASE_VERSION }},vanced/website-v2:dev-latest
+          build-args: |
+            REACT_APP_VANCED_LATEST_API_URL=${{ secrets.REACT_APP_VANCED_LATEST_API_URL_DEV }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
       - name: Pull and update a new version

.github/workflows/prod-ci.yml

@@ -28,7 +28,9 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: vanced/website-v2:${{ env.RELEASE_VERSION }}
+          tags: vanced/website-v2:${{ env.RELEASE_VERSION }},vanced/website-v2:latest
+          build-args: |
+            REACT_APP_VANCED_LATEST_API_URL=${{ secrets.REACT_APP_VANCED_LATEST_API_URL }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
       - name: Pull and update a new version

Dockerfile

@@ -6,6 +6,11 @@ RUN cd /src && npm install --loglevel error
 RUN npm install -g serve
 COPY . /src
 WORKDIR /src
+
+# Add environment variables
+ARG REACT_APP_VANCED_LATEST_API_URL
+RUN echo "REACT_APP_VANCED_LATEST_API_URL=$REACT_APP_VANCED_LATEST_API_URL" >> .env
+
 EXPOSE 4001
 RUN npm run build
 CMD serve -s build -l 4001

README.md

@@ -1,3 +1,31 @@
 Based on the template from https://github.com/facebook/create-react-app
 
- Vanced Website Repo (https://vancedapp.com)
+Vanced Website Repo (https://vancedapp.com)
+
+## Developing
+
+### 1. Running
+```
+npm start
+```
+
+## Docker testing
+
+### 1. Building local image
+```
+docker build --build-arg REACT_APP_VANCED_LATEST_API_URL=https://cors-anywhere.herokuapp.com/https://vancedapp.com/api/v1/latest.json -t vanced/website-v2:local .
+```
+
+### 2. Running the container
+```
+docker-compose up
+```
+
+Or to run in detached mode
+
+```
+docker-compose up -d
+```
+
+### 3. Open the site
+Go to http://localhost:4001/

docker-compose.yml

@@ -0,0 +1,6 @@
+version: '3'
+services:
+  backend:
+    image: vanced/website-v2:local
+    ports:
+      - "4001:4001"

src/App.js

@@ -48,7 +48,7 @@ const App = () => {
 	const [changeLogs, setChangeLogs] = useState({});
 
 	useEffect(() => {
-		fetch("https://vancedapp.com/api/v1/latest.json")
+		fetch(process.env.REACT_APP_VANCED_LATEST_API_URL)
 			.then(res => res.json())
 			.then(data => setChangeLogs(data));
 	}, []);