MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building of All-In-One-Image

This commit is contained in:
Micha Gläß-Stöcker 2021-08-15 20:17:22 +00:00 committed by Georg Krause
parent 48b355d145
commit 293b69e906
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.gitlab-ci.yml
View File

@ -266,34 +266,34 @@ docker_release:
tags: tags:
- docker-build - docker-build
#docker_all_in_one_release: docker_all_in_one_release:
# stage: deploy stage: deploy
# image: bash image: bash
# variables: variables:
# ALL_IN_ONE_REF: master ALL_IN_ONE_REF: main
# ALL_IN_ONE_ARTIFACT_URL: https://github.com/thetarkus/docker-funkwhale/archive/$ALL_IN_ONE_REF.zip 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 BUILD_PATH: all_in_one
# before_script: before_script:
# - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD - 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); - (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: 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 - 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 - wget $ALL_IN_ONE_ARTIFACT_URL -O all_in_one.zip
# - unzip -o all_in_one.zip -d tmpdir - unzip -o all_in_one.zip -d tmpdir
# - mv tmpdir/docker-funkwhale-$ALL_IN_ONE_REF $BUILD_PATH && rmdir tmpdir - mv tmpdir/docker-funkwhale-$ALL_IN_ONE_REF $BUILD_PATH && rmdir tmpdir
# - cp -r api $BUILD_PATH/src/api - cp -r api $BUILD_PATH/src/api
# - cp -r front $BUILD_PATH/src/front - cp -r front $BUILD_PATH/src/front
# - cd $BUILD_PATH - cd $BUILD_PATH
# - ./scripts/download-nginx-template.sh src/ $CI_COMMIT_REF_NAME - ./scripts/download-nginx-template.sh src/ $CI_COMMIT_REF_NAME
# - docker build -t $ALL_IN_ONE_IMAGE $DOCKER_LATEST_TAG . - docker build -t $ALL_IN_ONE_IMAGE $DOCKER_LATEST_TAG .
# - docker push $ALL_IN_ONE_IMAGE - docker push $ALL_IN_ONE_IMAGE
# - if [[ ! -z "$DOCKER_LATEST_TAG" ]]; then docker push $ALL_IN_ONE_IMAGE_LATEST; fi - if [[ ! -z "$DOCKER_LATEST_TAG" ]]; then docker push $ALL_IN_ONE_IMAGE_LATEST; fi
# only: only:
# - develop@funkwhale/funkwhale - develop@funkwhale/funkwhale
# - master@funkwhale/funkwhale - master@funkwhale/funkwhale
# - tags@funkwhale/funkwhale - tags@funkwhale/funkwhale
# tags: tags:
# - docker-build - docker-build
build_api: build_api:
# Simply publish a zip containing api/ directory # Simply publish a zip containing api/ directory

1
changes/changelog.d/1503.bugfix Normal file
View File

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