From c8f591342cb8f44846a71aab408d7a376e97bbad Mon Sep 17 00:00:00 2001 From: Dedy Martadinata Supriyadi Date: Fri, 11 Feb 2022 23:15:55 +0700 Subject: [PATCH] only target arm64, amd64 --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ Dockerfile.binary | 3 ++- server.package.json | 3 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d62e31..9c9dd20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,25 +8,25 @@ variables: ZIP_NAME: "deemix-docker" stages: - - build-deemix + #- build-deemix - build-binary - create-release - build-docker-image -build-deemix: - image: node:16 +#build-deemix: +# image: node:16 #image: node:16 - stage: build-deemix - script: - - apt update && apt install -y --no-install-recommends zip git curl +# stage: build-deemix +# script: +# - apt update && apt install -y --no-install-recommends zip git curl # Can replace with SHA-COMMIT - - export DATE=$(date +%Y%m%d) +# - export DATE=$(date +%Y%m%d) #- apk add --no-cache zip git curl - - git clone --depth=1 https://gitlab.com/RemixDev/deemix-gui.git --recursive - - cd deemix-gui - - yarn config set network-timeout 1000000 -g - - yarn install-all - - yarn predist +# - git clone --depth=1 https://gitlab.com/RemixDev/deemix-gui.git --recursive +# - cd deemix-gui +# - yarn config set network-timeout 1000000 -g +# - yarn install-all +# - yarn predist #- yarn --cwd server install --prod && yarn build-server && rm -rf server/node_modules #- yarn --cwd webui install --prod && yarn build-webui && rm -rf webui/node_modules #- yarn cache clean @@ -40,12 +40,12 @@ build-deemix: #- | # curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${ZIP_NAME}.zip ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip #- echo ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip #This for download URL dockerfile - only: - refs: - - CI-test - artifacts: - paths: - - deemix-gui/ +# only: +# refs: +# - CI-test +# artifacts: +# paths: +# - deemix-gui/ build-binary: diff --git a/Dockerfile.binary b/Dockerfile.binary index 8eead95..f177268 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -26,5 +26,6 @@ RUN ls -al webui && \ # fi; #RUN yarn install && yarn set-version && ./node_modules/.bin/pkg --out-dir dist ./server/package.json && yarn reset-version && ls -al dist/ -RUN yarn dist-server && ls -al dist/; +RUN yarn dist-server && ls -al dist/ && chmod +x dist/deemix-server* RUN curl --header "JOB-TOKEN: ${JOB_TOKEN}" --upload-file dist/deemix-server-linux ${PACKAGE_REGISTRY_URL}/deemix-server-linux-$TARGETARCH +RUN curl --header "JOB-TOKEN: ${JOB_TOKEN}" --upload-file dist/deemix-server-arm64 ${PACKAGE_REGISTRY_URL}/deemix-server-linux-$TARGETARCH diff --git a/server.package.json b/server.package.json index ea23f57..543422d 100644 --- a/server.package.json +++ b/server.package.json @@ -23,8 +23,7 @@ ], "targets": [ "node16-linux-x64", - "node16-linux-arm64", - "node16-linux-armv7" + "node16-linux-arm64" ] }, "dependencies": {