Commit 32b290d7 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.92'

parents 56ecf008 13ff53a2
......@@ -6,7 +6,7 @@ services:
before_script:
- apk add --no-cache py-pip
- pip install docker-compose
- echo "$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
......@@ -14,10 +14,12 @@ build-master:
- docker build \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg VERSION=`cat sickrage/version.txt` \
--squash --pull -t "$CI_PROJECT_NAMESPACE"/"$CI_PROJECT_NAME":latest .
- docker push "$CI_PROJECT_NAMESPACE"/"$CI_PROJECT_NAME":latest
--squash --pull -t "sickrage/sickrage":latest .
- docker push "sickrage/sickrage":latest
only:
- master
except:
- tags
build-dev:
stage: build
......@@ -25,7 +27,8 @@ build-dev:
- docker build \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg VERSION=`cat sickrage/version.txt` \
--squash --pull -t "$CI_PROJECT_NAMESPACE"/"$CI_PROJECT_NAME":"$CI_COMMIT_REF_SLUG" .
- docker push "$CI_PROJECT_NAMESPACE"/"$CI_PROJECT_NAME":"$CI_COMMIT_REF_SLUG"
--squash --pull -t "sickrage/sickrage":"$CI_COMMIT_REF_SLUG" .
- docker push "sickrage/sickrage":"$CI_COMMIT_REF_SLUG"
except:
- master
\ No newline at end of file
- master
- tags
\ No newline at end of file
# Changelog
- * b07227d - 2018-10-15: Release v9.3.91
- * 4475b44 - 2018-10-15: Release v9.3.92
- * def0213 - 2018-10-15: Updated .gitlab-ci.yml
- * 4500af0 - 2018-10-15: Release v9.3.91
- * b226cf4 - 2018-10-15: Updated .gitlab-ci.yml
- * b4d3c18 - 2018-10-15: Release v9.3.90
- * 70b40c6 - 2018-10-15: Updated .gitignore
......
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sickragetv\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2018-10-15 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:56\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:16\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:56\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:16\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:56\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:57\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:57\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:57\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:57\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:59\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:18\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 21:56-0700\n"
"PO-Revision-Date: 2018-10-16 04:57\n"
"POT-Creation-Date: 2018-10-15 22:16-0700\n"
"PO-Revision-Date: 2018-10-16 05:17\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