diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb996556cc275c7c673c0a96891bbd3858846d8e..6fb03dea9688d9872faa0ae5afbe1bfa13a9cc19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - release variables: - FC_PREGMOD_HTML: "FC_pregmod_${CI_COMMIT_TAG}.html" + FC_PREGMOD_ARCHIVE: "FC_pregmod_${CI_COMMIT_TAG}.zip" build: stage: build @@ -26,9 +26,9 @@ upload: - if: $CI_COMMIT_TAG =~ /\A\d+\.\d+\.\d+\z/ script: - mega-login $MEGA_MAIL $MEGA_PWD - - mv bin/FC_pregmod.html bin/$FC_PREGMOD_HTML - - mega-put bin/$FC_PREGMOD_HTML / - - echo "MEGA_URL=$(mega-export -a /$FC_PREGMOD_HTML | grep -o https.*)" >> variables.env + - zip bin/$FC_PREGMOD_ARCHIVE bin/FC_pregmod.html + - mega-put bin/$FC_PREGMOD_ARCHIVE / + - echo "MEGA_URL=$(mega-export -a /$FC_PREGMOD_ARCHIVE | grep -o https.*)" >> variables.env artifacts: # carry MEGA_URL over to the release job reports: @@ -54,4 +54,4 @@ release: - | release-cli create --name "$CI_COMMIT_TAG" --description "$DESCRIPTION" \ --tag-name "$CI_COMMIT_TAG" \ - --assets-link "{\"name\":\"${FC_PREGMOD_HTML}\",\"url\":\"${MEGA_URL}\"}" + --assets-link "{\"name\":\"${FC_PREGMOD_ARCHIVE}\",\"url\":\"${MEGA_URL}\"}" diff --git a/docker/megacmd/Dockerfile b/docker/megacmd/Dockerfile index d454f095cd53ae5979d12b497e0045d3b80d8736..6b2b1dda7d94b6982a0996a6d0892451af7624b3 100644 --- a/docker/megacmd/Dockerfile +++ b/docker/megacmd/Dockerfile @@ -6,12 +6,17 @@ # Debug build process # docker build --no-cache --progress=plain -t megacmd . -#Create debian as base image +# Create debian as base image FROM debian -#Install packages +# Update RUN apt-get -y update RUN apt-get -y upgrade + +# Install zip +RUN apt-get -y install zip + +# mega cmd # Install dependencies, when changing mega versions these may need to be adjusted RUN apt-get -y install libc-ares2 libcrypto++6 libmediainfo0v5 libpcrecpp0v5 libzen0v5 # Install mega cmd