Merge branch 'develop' into master

EpicMorg · Sep 4, 2020 · 19397f5 · 19397f5
2 parents 876a851 + 1d0d1c1
commit 19397f5
Showing 1 changed file with 0 additions and 64 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -116,37 +116,6 @@ matrix:
       - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11
       - docker push epicmorg/edge:jdk11
 
-##########
-
-    - name: Base Edge Bullseye
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/edge:bullseye epicmorg/edge-bullseye/main
-      - docker push epicmorg/edge:bullseye
-
-    - name: Base Edge Bullseye + JDK 6
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/edge:jdk6 epicmorg/edge-bullseye/jdk6
-      - docker push epicmorg/edge:bullseye-jdk6
-
-    - name: Base Edge Bullseye + JDK 7
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/edge:jdk7 epicmorg/edge-bullseye/jdk7
-      - docker push epicmorg/edge:bullseye-jdk7
-
-    - name: Base Edge Bullseye + JDK 8
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge-bullseye/jdk8
-      - docker push epicmorg/edge:bullseye-jdk8
-
-    - name: Base Edge Bullseye + JDK 11
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge-bullseye/jdk11
-      - docker push epicmorg/edge:bullseye-jdk11
 
 ##########
 
@@ -180,39 +149,6 @@ matrix:
       - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
       - docker push epicmorg/devel:jdk11
 
-
-##########
-
-    - name: Base Develop Bullseye
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/devel:bullseye epicmorg/devel-bullseye/main
-      - docker push epicmorg/devel:bullseye
-
-    - name: Base Develop + JDK 6
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/devel:jdk6 epicmorg/devel-bullseye/jdk6
-      - docker push epicmorg/devel:bullseye-jdk6
-
-    - name: Base Develop + JDK 7
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/devel:jdk7 epicmorg/devel-bullseye/jdk7
-      - docker push epicmorg/devel:bullseye-jdk7
-
-    - name: Base Develop + JDK 8
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel-bullseye/jdk8
-      - docker push epicmorg/devel:bullseye-jdk8
-
-    - name: Base Develop + JDK 11
-      script:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-      - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
-      - docker push epicmorg/devel:bullseye-jdk11
-
 ##########
 
     - name: TeamCity Agent