EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-10-16 23:36:58 +03:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
STAM 2020-02-06 17:59:29 +03:00
parent d4744297c0
commit 30174345bc
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.travis.yml
View File

@ -54,43 +54,61 @@ matrix:
# - docker build --compress -t user/repo:tag path/to/folder/contains/dockerfile
# - docker push user/repo:tag
- name: Base Production + JDK 8 + JDK 11
- name: Base Production + JDK 6, 7, 8 11
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/prod:latest epicmorg/prod/main
- docker push epicmorg/prod:latest
- docker build --compress -t epicmorg/prod:jdk6 epicmorg/prod/jdk6
- docker push epicmorg/prod:jdk6
- docker build --compress -t epicmorg/prod:jdk7 epicmorg/prod/jdk7
- docker push epicmorg/prod:jdk7
- docker build --compress -t epicmorg/prod:jdk8 epicmorg/prod/jdk8
- docker push epicmorg/prod:jdk8
- docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11
- docker push epicmorg/prod:jdk11
##########
- name: Edge + JDK 8 + JDK 11
- name: Base Edge + JDK 6, 7, 8 11
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:latest epicmorg/edge/main
- docker push epicmorg/edge:latest
- docker build --compress -t epicmorg/edge:jdk6 epicmorg/edge/jdk6
- docker push epicmorg/edge:jdk6
- docker build --compress -t epicmorg/edge:jdk7 epicmorg/edge/jdk7
- docker push epicmorg/edge:jdk7
- docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge/jdk8
- docker push epicmorg/edge:jdk8
- docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11
- docker push epicmorg/edge:jdk11
##########
- name: Base Develop + JDK 8 + JDK 11
- name: Base Develop JDK 6, 7, 8 11
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:latest epicmorg/devel/main
- docker push epicmorg/devel:latest
- docker build --compress -t epicmorg/devel:jdk6 epicmorg/devel/jdk6
- docker push epicmorg/devel:jdk6
- docker build --compress -t epicmorg/devel:jdk7 epicmorg/devel/jdk7
- docker push epicmorg/devel:jdk7
- docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel/jdk8
- docker push epicmorg/devel:jdk8
- docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
- docker push epicmorg/devel:jdk11
@ -1482,4 +1500,9 @@ matrix:
#### Our minor priority images
#########################################
- name: PostgresSQL 9.3
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/postgres:9.3 postgres/9.3
- docker push epicmorg/postgres:9.3

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
* `fixed` all `*.sh` chmods. (sorry)
* fixed `balancer` final container with `edge`.
* `websites` migrated to `edge`. why not?
* added `jdk6` and `jdk7` base images
* addded `PostgresSQL 9.3`
* `January 2020` (01/13/2020 - 01/30/2020)
* separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11`
* teamcity - `devel:jdk11`