Fixing edge

Author: githubsaturn

dev-scripts/build_and_push_edge.sh

@@ -33,6 +33,7 @@ if [[ "$BRANCH" != "master" ]]; then
     exit 1
 fi
 
+## Building frontend app
 ORIG_DIR=$(pwd)
 FRONTEND_DIR=/home/runner/app-frontend
 curl -Iv https://registry.yarnpkg.com/
@@ -44,15 +45,9 @@ yarn install --no-cache --frozen-lockfile --network-timeout 600000
 echo "Installation finished"
 yarn run build
 echo "Building finished"
-
 cd $ORIG_DIR
-
 mv $FRONTEND_DIR/caprover-frontend/build ./dist-frontend
 
-ls -lah ./dist-frontend
-
-exit 0
-
 docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 export DOCKER_CLI_EXPERIMENTAL=enabled
 docker buildx ls

dockerfile-captain.edge

@@ -15,25 +15,9 @@ RUN npm ci && \
      mv ./edge-override.json ./config-override.json
 
 
-# Build frontend code.
-
  # This quick hack invalidates the cache.
 ADD https://www.google.com /time.now
 
-
-# armV7 fails: https://github.com/yarnpkg/yarn/issues/5259 https://github.com/nodejs/docker-node/issues/1335
-# RUN curl -Iv https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.1.0.tgz && \
-RUN curl -Iv https://registry.yarnpkg.com/ && \
-    mkdir -p /usr/src/app-frontend && cd /usr/src/app-frontend && \
-    git clone https://github.com/githubsaturn/caprover-frontend.git && \
-    cd caprover-frontend && \
-    git log --max-count=1 && \
-    yarn install  --no-cache --frozen-lockfile --network-timeout 600000 && echo "Installation finished" && \
-    yarn run build && echo "Building finished" && \
-    mv ./build ../../app/dist-frontend && \
-    cd / && \
-    rm -rf /usr/src/app-frontend
-
 ENV NODE_ENV production
 ENV PORT 3000
 EXPOSE 3000