diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ddcc65..044cef2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,22 +14,13 @@ before_script: build.tags: stage: build - script: /bin/bash -e .utilities/build.tags.sh + script: /bin/bash -e .utilities/build.sh only: - tags artifacts: paths: - $CI_PROJECT_NAME.tar -build.schedules: - stage: build - script: /bin/bash -e .utilities/build.schedules.sh - only: - - schedules - artifacts: - paths: - - $CI_PROJECT_NAME.tar - test: stage: test script: /bin/bash -e .utilities/test.sh @@ -42,22 +33,13 @@ test: publish.tags: stage: publish - script: /bin/bash -e .utilities/publish.tags.sh + script: /bin/bash -e .utilities/publish.sh only: - tags artifacts: paths: - $CI_PROJECT_NAME.tar -publish.schedules: - stage: publish - script: /bin/bash -e .utilities/publish.schedules.sh - only: - - schedules - artifacts: - paths: - - $CI_PROJECT_NAME.tar - #update_docker_hub_full_description: # stage: publish # script: /bin/bash -e .utilities/update-docker-hub-full-description.sh diff --git a/.utilities/build.schedules.sh b/.utilities/build.schedules.sh deleted file mode 100644 index ef75070..0000000 --- a/.utilities/build.schedules.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Docker Seafile client, help you mount a Seafile library as a volume. -# Copyright (C) 2019-2020, flow.gunso@gmail.com -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Hard reset to the latest tag. -latest_version=$(git describe --abbrev=0) -git reset --hard $latest_version - -cp -R tests seafile-client/ -cd seafile-client/ - -docker build \ - --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ - --build-arg VCS_REF=$(git rev-parse --short HEAD) \ - --build-arg VERSION=$latest_version \ - --tag $CI_PROJECT_NAME:build . - -docker save --output ../$CI_PROJECT_NAME.tar $CI_PROJECT_NAME:build diff --git a/.utilities/build.tags.sh b/.utilities/build.sh similarity index 100% rename from .utilities/build.tags.sh rename to .utilities/build.sh diff --git a/.utilities/check.sh b/.utilities/check.sh index 08ce905..34be9f6 100644 --- a/.utilities/check.sh +++ b/.utilities/check.sh @@ -17,24 +17,11 @@ # along with this program. If not, see . # Check the CI pipeline sources. -if ! [[ "$CI_PIPELINE_SOURCE" == "push" || "$CI_PIPELINE_SOURCE" == "schedule" ]]; then - echo "CI pipelines are only allowed from the push and schedule sources" +if ! [[ "$CI_PIPELINE_SOURCE" == "push" ]]; then + echo "CI pipelines are only allowed from push." exit 1 fi -# Check the schedule target for the scheduled CI pipelines. -if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then - if [[ -z "$SCHEDULE_TARGET" ]]; then - echo "\$SCHELUDE_TARGET was not provided." - exit 1 - fi - - if ! [[ "$SCHEDULE_TARGET" == "weekly" ]]; then - echo "\$SCHEDULE_TARGET $SCHEDULE_TARGET is not known." - exit 1 - fi -fi - # Check the tag is properly defined on job other than update_docker_hub_full_description job, # on pushed CI pipelines. if [[ "$CI_PIPELINE_SOURCE" == "push" ]]; then diff --git a/.utilities/publish.schedules.sh b/.utilities/publish.schedules.sh deleted file mode 100644 index 671c1db..0000000 --- a/.utilities/publish.schedules.sh +++ /dev/null @@ -1,34 +0,0 @@ -# !/bin/bash - -# Docker Seafile client, help you mount a Seafile library as a volume. -# Copyright (C) 2019-2020, flow.gunso@gmail.com -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -SCRIPT_DIRECTORY=$(dirname ${BASH_SOURCE[0]}) -source $SCRIPT_DIRECTORY/utilities.sh -load_images_artifacts - -tags=("latest") -for version_component in "$(git describe --abbrev=0 | tr '.' '\n')"; do - tag+="$version_component" - tags+=("$tag") - tag+="." -done - -echo $CI_REGISTRY_BOT_PASSWORD | docker login --password-stdin --username $CI_REGISTRY_BOT_USERNAME -for tag in "${tags[@]}"; do - docker tag $CI_PROJECT_NAME:build $CI_REGISTRY_IMAGE:$tag - docker push $CI_REGISTRY_IMAGE:$tag -done diff --git a/.utilities/publish.tags.sh b/.utilities/publish.sh similarity index 100% rename from .utilities/publish.tags.sh rename to .utilities/publish.sh diff --git a/README.md b/README.md index 1c90d04..94aef6b 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ * Upload and download speeds are configurable. * SSL certificates are skippable. -* Supported tags are rebuilt weekly. - * Ask questions on [Seafile forum](https://forum.seafile.com/t/docker-client-to-sync-files-with-containers/8573). * Contribute and report issues on [Gitlab](https://gitlab.com/flwgns-docker/seafile-client/).