diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed79caf..46ddc0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,8 +35,8 @@ build-deemix: - zip -9 -r ${ZIP_NAME}.zip deemix-docker - | curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${ZIP_NAME}.zip ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip - #- | - # curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${ZIP_NAME}.zip ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}-${DATE}.zip + - | + curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${ZIP_NAME}.zip ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}${DATE}.zip - echo ${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip #This for download URL dockerfile artifacts: paths: @@ -51,9 +51,8 @@ create-release: - export DATE=$(date +%Y%m%d) #Cant tag same twice use $CI_COMMIT_SHA for a while - | release-cli create --name "Release $DATE" --tag-name $CI_COMMIT_SHA \ - --assets-link "{\"name\":\"${ZIP_NAME}.zip\",\"url\":\"${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip\"}" -#\ -# --assets-link "{\"name\":\"${ZIP_NAME}-${DATE}.zip\",\"url\":\"${PACKAGE_REGISTRY_URL}/${ZIP_NAME}-${DATE}.zip\"}" + --assets-link "{\"name\":\"${ZIP_NAME}.zip\",\"url\":\"${PACKAGE_REGISTRY_URL}/${ZIP_NAME}.zip\"}"\ + --assets-link "{\"name\":\"${ZIP_NAME}-${DATE}.zip\",\"url\":\"${PACKAGE_REGISTRY_URL}/${ZIP_NAME}${DATE}.zip\"}" build-docker-image: diff --git a/Dockerfile b/Dockerfile index 2583a54..5deda91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \ #RUN curl -L -o deemix.zip http://gitlab.com/Bockiii/deemix-src/-/jobs/artifacts/master/download?job=dl_src && \ # unzip deemix -# Need look again in CI ## project num -RUN curl -L https://gitlab.com/api/v4/projects/##/packages/generic//deemix-docker/deemix-docker.zip -o deemix-docker.zip && \ +# Need look again in project num +RUN curl -L https://gitlab.com/api/v4/projects/33610953/packages/generic//deemix-docker/deemix-docker.zip -o deemix-docker.zip && \ unzip deemix-docker COPY root/ / diff --git a/root/etc/services.d/deemix/run b/root/etc/services.d/deemix/run index 97f16b1..dc39015 100644 --- a/root/etc/services.d/deemix/run +++ b/root/etc/services.d/deemix/run @@ -17,4 +17,4 @@ export DEEMIX_SERVER_PORT=$port export DEEMIX_HOST=0.0.0.0 echo "[services.d] Starting Deemix" -s6-setuidgid abc node /deemix-gui/server/dist/app.js \ No newline at end of file +s6-setuidgid abc node /deemix-docker/server/dist/app.js --host 0.0.0.0