diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39894e967ccfcde40a177abc2ae07a605d9855e1..628b699ec29150f82e531e9ae23ea670e454b904 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,3 +16,6 @@ build_image: - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME . - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi + except: + changes: + - templates/* diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000000000000000000000000000000000000..dcf3d69e204583aad7fdf4a27accc86166e547f0 --- /dev/null +++ b/LICENCE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Jan Grewe + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml new file mode 100644 index 0000000000000000000000000000000000000000..1eeaa67e416be3a255b7c2dd00de4a829a00d200 --- /dev/null +++ b/templates/gitlab-ci-publish-app.yml @@ -0,0 +1,65 @@ + +.publish to apps: + image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest + stage: publish + variables: + APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}' + before_script: + - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null + - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa + - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: + - echo "$KEY" + - echo "$TYPE" + - echo "$URL" + - | + version=$APP_VERSION_NUMBER + version=$(echo $version | sed 's/(/_/g') + version=$(echo $version | sed 's/)/_/g') + version=$(echo $version | sed 's/ //g') + version=$(echo -n $(date +"%s").$version | md5sum | cut -d ' ' -f 1) + + apk_name=$version"_"$APP_PACKAGE_NAME".apk"; + icon_name=$APP_PACKAGE_NAME".png"; + APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/') + - echo "$APP_JSON" + - ls ~/.ssh +# - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name +# - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name + - sleep 90 + - | + response=$(curl -k \ + -X POST \ + -d "data=$APP_JSON" \ + -d "t=$TYPE" \ + -d "k=$KEY" \ + $URL) + - if ! echo $response | grep -q SUCC ; then echo Failed ; exit 1 ; fi + + +#include: +# - project: 'e/apps/docker-android-apps-cicd' +# ref: master +# file: '/templates/.gitlab-ci-publish-app.yml' +#apps: +# extends: .publish to apps +# variables: +# APP_NAME: "Light" +# APP_AUTHOR: "eFoundation" +# APP_PACKAGE_NAME: "foundation.e.foundation" +# APP_ICON_PATH: "" +# APP_CATEGORY: "default_app" +# APP_DESCRIPTION: "light app" +# APP_LICENSE: "Apache 2.0" +# APP_VERSION_NUMBER: "4.1.0" +# URL: +# KEY: +# TYPE: +# APK_PATH: +# ICON_PATH diff --git a/templates/test.sh b/templates/test.sh new file mode 100755 index 0000000000000000000000000000000000000000..01870ecd2b1ffcdf3346b0e388c407f25365b551 --- /dev/null +++ b/templates/test.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +APP_VERSION_NUMBER=4.1.0 +APP_PACKAGE_NAME="foundation.e.foundation" +APP_JSON='{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}' + +version=$APP_VERSION_NUMBER +version=$(echo $version | sed 's/(/_/g') +version=$(echo $version | sed 's/)/_/g') +version=$(echo $version | sed 's/ //g') +version=$(echo -n $(date +"%s").$version | md5sum | cut -d ' ' -f 1) + +apk_name=$version"_"$APP_PACKAGE_NAME".apk"; +icon_name=$version"_"$APP_PACKAGE_NAME".png"; +APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/') + + +echo $apk_name +echo $icon_name +echo $APP_JSON