Added new latest tag

cperrin88 · Feb 14, 2017 · 9f1fa66 · 9f1fa66
1 parent cd3b47b
commit 9f1fa66
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,15 @@ language: bash
 service: docker
 
 env:
-  - VERSION=3.3
-  - VERSION=3.3.4
-  - VERSION=3.4.3
-  - VERSION=3.5
+  - VERSION=3.3 TAG=3.3
+  - VERSION=3.3.4 TAG=3.3.4
+  - VERSION=3.4.3 TAG=3.4.3
+  - VERSION=3.5 TAG=3.5
+  - VERSION=3.5 TAG=latest
 
-before_install:
-  - docker build -t $DOCKER_USERNAME/studip:$VERSION $VERSION
+script:
+  - docker build -t $DOCKER_USERNAME/studip:$TAG $VERSION
 
 after_script:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-  - docker push $DOCKER_USERNAME/studip:$VERSION
+  - docker push $DOCKER_USERNAME/studip:$TAG
diff --git a/template/Dockerfile.template → Dockerfile.template b/template/Dockerfile.template → Dockerfile.template
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
-# Docker StudIP
+# Supported tags and respective  `Dockerfile` links
 
-This project aims to bring [StudIP](http://www.studip.de) to Docker
+ - `3.5`, `latest` [(3.5/Dockerfile)](https://github.com/cperrin88/docker-studip/tree/master/3.5/Dockerfile)
+ - `3.4.3` [(3.4.3/Dockerfile)](https://github.com/cperrin88/docker-studip/tree/master/3.4.3/Dockerfile)
+ - `3.3.4` [(3.3.4/Dockerfile)](https://github.com/cperrin88/docker-studip/tree/master/3.3.4/Docker)
+ - `3.3` [(3.3/Dockerfile)](https://github.com/cperrin88/docker-studip/tree/master/3.3/Docker)
diff --git a/data.sh b/data.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 declare -A sha1_hashes=(
   [3.3]='97fbac00f6a02570d93e902b06ddfb03698baa39'
   [3.3.4]='bde8572b2f5570ca074035d74b41e921779d0265'

diff --git a/template/entrypoint → entrypoint b/template/entrypoint → entrypoint
diff --git a/template/php.ini → php.ini b/template/php.ini → php.ini
diff --git a/template/travis.yml.template → travis.yml.template b/template/travis.yml.template → travis.yml.template
@@ -5,9 +5,9 @@ service: docker
 
 env:%%ENVS%%
 
-before_install:
-  - docker build -t $DOCKER_USERNAME/studip:$VERSION $VERSION
+script:
+  - docker build -t $DOCKER_USERNAME/studip:$TAG $VERSION
 
 after_script:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-  - docker push $DOCKER_USERNAME/studip:$VERSION
+  - docker push $DOCKER_USERNAME/studip:$TAG
diff --git a/update.sh b/update.sh
@@ -13,17 +13,19 @@ envs=""
 
 for version in "${versions[@]}"; do
   mkdir -p "$version"
-  cp --force template/Dockerfile.template "$version/Dockerfile"
-  cp --force template/php.ini "$version/php.ini"
-  cp --force template/entrypoint "$version/entrypoint"
+  cp --force Dockerfile.template "$version/Dockerfile"
+  cp --force php.ini "$version/php.ini"
+  cp --force entrypoint "$version/entrypoint"
   sed -ri \
     -e 's!%%STUDIP_VERSION%%!'"$version"'!' \
     -e 's!%%STUDIP_PHP_VERSION%%!'"${php_versions[$version]}"'!' \
     -e 's!%%STUDIP_DOWNLOAD_URL%%!'"${download_urls[$version]}"'!' \
     -e 's!%%STUDIP_ARCHIVE_HASH_SHA1%%!'"${sha1_hashes[$version]}"'!' \
     "$version/Dockerfile"
-  envs+="\n  - VERSION=$version"
+  envs+="\n  - VERSION=$version TAG=$version"
 done
 
-cp --force template/travis.yml.template ./.travis.yml
+envs+="\n  - VERSION=$version TAG=latest"
+
+cp --force travis.yml.template ./.travis.yml
 sed -ri -e 's!%%ENVS%%!'"$envs"'!' ./.travis.yml