Fix building of All-In-One-Image

.gitlab-ci.yml

@@ -266,34 +266,34 @@ docker_release:
   tags:
     - docker-build
 
-#docker_all_in_one_release:
-#  stage: deploy
-#  image: bash
-#  variables:
-#    ALL_IN_ONE_REF: master
-#    ALL_IN_ONE_ARTIFACT_URL: https://github.com/thetarkus/docker-funkwhale/archive/$ALL_IN_ONE_REF.zip
-#    BUILD_PATH: all_in_one
-#  before_script:
-#    - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-#    - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "master" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi);
-#  script:
-#    - if [[ ! -z "$CI_COMMIT_TAG" ]]; then (./docs/get-releases-json.py | scripts/is-docker-latest.py $CI_COMMIT_TAG -) && export DOCKER_LATEST_TAG="-t $ALL_IN_ONE_IMAGE_LATEST" || export DOCKER_LATEST_TAG=; fi
-#    - wget $ALL_IN_ONE_ARTIFACT_URL -O all_in_one.zip
-#    - unzip -o all_in_one.zip -d tmpdir
-#    - mv tmpdir/docker-funkwhale-$ALL_IN_ONE_REF $BUILD_PATH && rmdir tmpdir
-#    - cp -r api $BUILD_PATH/src/api
-#    - cp -r front $BUILD_PATH/src/front
-#    - cd $BUILD_PATH
-#    - ./scripts/download-nginx-template.sh src/ $CI_COMMIT_REF_NAME
-#    - docker build -t $ALL_IN_ONE_IMAGE $DOCKER_LATEST_TAG .
-#    - docker push $ALL_IN_ONE_IMAGE
-#    - if [[ ! -z "$DOCKER_LATEST_TAG" ]]; then docker push $ALL_IN_ONE_IMAGE_LATEST; fi
-#  only:
-#    - develop@funkwhale/funkwhale
-#    - master@funkwhale/funkwhale
-#    - tags@funkwhale/funkwhale
-#  tags:
-#    - docker-build
+docker_all_in_one_release:
+  stage: deploy
+  image: bash
+  variables:
+    ALL_IN_ONE_REF: main
+    ALL_IN_ONE_ARTIFACT_URL: https://dev.funkwhale.audio/funkwhale/funkwhale-docker-all-in-one/-/archive/$ALL_IN_ONE_REF/funkwhale-docker-all-in-one-$ALL_IN_ONE_REF.tar.gz
+    BUILD_PATH: all_in_one
+  before_script:
+    - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+    - (if [ "$CI_COMMIT_REF_NAME" == "develop" ] || [ "$CI_COMMIT_REF_NAME" == "master" ]; then ./scripts/set-api-build-metadata.sh $(echo $CI_COMMIT_SHA | cut -c 1-8); fi);
+  script:
+    - if [[ ! -z "$CI_COMMIT_TAG" ]]; then (./docs/get-releases-json.py | scripts/is-docker-latest.py $CI_COMMIT_TAG -) && export DOCKER_LATEST_TAG="-t $ALL_IN_ONE_IMAGE_LATEST" || export DOCKER_LATEST_TAG=; fi
+    - wget $ALL_IN_ONE_ARTIFACT_URL -O all_in_one.zip
+    - unzip -o all_in_one.zip -d tmpdir
+    - mv tmpdir/docker-funkwhale-$ALL_IN_ONE_REF $BUILD_PATH && rmdir tmpdir
+    - cp -r api $BUILD_PATH/src/api
+    - cp -r front $BUILD_PATH/src/front
+    - cd $BUILD_PATH
+    - ./scripts/download-nginx-template.sh src/ $CI_COMMIT_REF_NAME
+    - docker build -t $ALL_IN_ONE_IMAGE $DOCKER_LATEST_TAG .
+    - docker push $ALL_IN_ONE_IMAGE
+    - if [[ ! -z "$DOCKER_LATEST_TAG" ]]; then docker push $ALL_IN_ONE_IMAGE_LATEST; fi
+  only:
+    - develop@funkwhale/funkwhale
+    - master@funkwhale/funkwhale
+    - tags@funkwhale/funkwhale
+  tags:
+    - docker-build
 
 build_api:
   # Simply publish a zip containing api/ directory

changes/changelog.d/1503.bugfix

@@ -0,0 +1 @@
+fixed the all in one docker image building process, related to #1503