Merge pull request #149 from PhlexPlexico/workflow-patch

Add arm arch to builds

Author: PhlexPlexico

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,10 +28,13 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. chrome, safari]
  - Version [e.g. 22]
 
-**Server info
+**Server info**
  - OS: [e.g. Ubuntu, CentOS, Windows]
  - Version (16.04, 8.1.1911, 10]
  - NodeJS version (e.g. 13.13.0)
 
+**Docker Information**
+If you are running through docker, please provide as much information as you can with your docker files. Please make sure to scrub your data and remove any keys such as the DB keys, Steam API key, or MySQL passwords.
+
 **Additional context**
 Add any other context about the problem here.

.github/workflows/ghcr.yml

@@ -6,45 +6,20 @@ on:
       - master
 jobs:
   push:
-    name: "Push amd64 build"
+    name: "Create build and push to GHCR"
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - id: string
-        uses: ASzc/change-string-case-action@v2
-        with:
-          string: ${{ github.repository_owner }}
-      - uses: actions/checkout@v2
-      - uses: docker/login-action@v1
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile
-          #TODO: Fix GitHub Actions Building?
-          #platforms: linux/arm/v7,linux/amd64
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ghcr.io/${{ steps.string.outputs.lowercase }}/g5api:latest
-  push-arm:
-    name: "Push armv7 build"
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+          image: tonistiigi/binfmt:latest
+          platforms: all
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+        with:
+          buildkitd-flags: --debug
       - id: string
         uses: ASzc/change-string-case-action@v2
         with:
@@ -61,7 +36,7 @@ jobs:
           file: Dockerfile
           #TODO: Fix GitHub Actions Building?
           #platforms: linux/arm/v7,linux/amd64
-          platforms: linux/arm/v7
+          platforms: linux/amd64,linux/arm/v7
           push: true
           tags: |
             ghcr.io/${{ steps.string.outputs.lowercase }}/g5api:latest

Dockerfile

@@ -6,27 +6,24 @@ EXPOSE 3301
 
 # update and install initial packages
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+    ca-certificates \
     curl \
     apt-transport-https \
     lsb-release \
     gnupg \
     git
 
+# SSL Errors Exist in 6-buster. Let's ignore them for now...
+RUN echo "-k" > ~/.curlrc
 # add yarn repo
 RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 # install nvm and node 13.8.0
-# SHELL ["/bin/bash", "--login", "-c"]
-# RUN curl -o- -k https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
-# RUN nvm install 16.5.0
-ENV NODE_VERSION=16.5.0
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
-ENV NVM_DIR=/root/.nvm
-RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
-RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
-RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
-ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+SHELL ["/bin/bash", "--login", "-c"]
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
+RUN nvm install 16.5.0
+
 
 # install yarn
 RUN apt-get update && apt-get install --no-install-recommends -y \