Commit 4c81299f authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.94'

parents 82fd18d3 8b3319df
......@@ -6,15 +6,12 @@ services:
before_script:
- apk add --no-cache py-pip
- pip install docker-compose
- echo -n "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
- echo -n $CI_REGISTRY_PASSWORD | docker login -u "$CI_REGISTRY_USER" --password-stdin
build-master:
stage: build
script:
- docker build \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg VERSION=`cat sickrage/version.txt` \
--squash --pull -t "sickrage/sickrage:latest" .
- docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:latest .
- docker push "sickrage/sickrage:latest"
only:
- master
......@@ -24,11 +21,8 @@ build-master:
build-dev:
stage: build
script:
- docker build \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg VERSION=`cat sickrage/version.txt` \
--squash --pull -t "sickrage/sickrage:$CI_COMMIT_REF_SLUG" .
- docker push "sickrage/sickrage:$CI_COMMIT_REF_SLUG"
- docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VERSION=`cat sickrage/version.txt` -t sickrage/sickrage:$CI_COMMIT_REF_SLUG .
- docker push sickrage/sickrage:$CI_COMMIT_REF_SLUG
except:
- master
- tags
\ No newline at end of file
# Changelog
- * 6ae77e9 - 2018-10-15: Release v9.3.93
- * 373e2c3 - 2018-10-15: Release v9.3.94
- * 47ce84c - 2018-10-16: Update .gitlab-ci.yml
- * bc472cc - 2018-10-16: Update .gitlab-ci.yml
- * eb1a642 - 2018-10-15: Release v9.3.93
- * 13ff53a - 2018-10-15: Release v9.3.92
- * def0213 - 2018-10-15: Updated .gitlab-ci.yml
- * 4500af0 - 2018-10-15: Release v9.3.91
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:24\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:39\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Arabic\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:24\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:39\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Catalan\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:24\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:39\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:24\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:39\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:25\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:40\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:25\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:40\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Greek\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:25\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:40\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: English\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:26\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:41\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 22:24-0700\n"
"PO-Revision-Date: 2018-10-16 05:25\n"
"POT-Creation-Date: 2018-10-15 22:39-0700\n"
"PO-Revision-Date: 2018-10-16 05:40\n"
"Last-Translator: echel0n <[email protected]>\n"
"Language-Team: Finnish\n"
"MIME-Version: 1.0\n"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment