Rebase to _/eclipse-temurin, drop alpine 3.13 variants

wodby · Apr 19, 2022 · 88c6fb6 · 88c6fb6
1 parent 89c28c3
commit 88c6fb6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 33 deletions.
diff --git a/.github/actions/action.yml b/.github/actions/action.yml
@@ -7,17 +7,13 @@ inputs:
   tags:
     description: image tags
     required: true
-  alpine_ver:
-    description: alpine version
-    required: true
 runs:
   using: "composite"
   steps:
   - name: Build image
     env:
       ELASTICSEARCH_VER: ${{ inputs.version }}
       TAGS: ${{ inputs.tags }}
-      ALPINE_VER: ${{ inputs.alpine_ver }}
     run: |
       set -e
       make

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -11,8 +11,6 @@ on:
 env:
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  ELASTICSEARCH7: '7.17.2'
-  ELASTICSEARCH6: '6.8.23'
 
 jobs:
   elasticsearch-7:
@@ -21,33 +19,13 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ./.github/actions
       with:
-        version: ${{ env.ELASTICSEARCH7 }}
+        version: '7.17.2'
         tags: 7.17,7,latest
-        alpine_ver: 3.15
   elasticsearch-6:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: ./.github/actions
       with:
-        version: ${{ env.ELASTICSEARCH6 }}
+        version: '6.8.23'
         tags: 6.8,6
-        alpine_ver: 3.15
-  elasticsearch-7-alpine313:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions
-      with:
-        version: ${{ env.ELASTICSEARCH7 }}
-        tags: 7.17-alpine3.13,7-alpine3.13,alpine3.13
-        alpine_ver: 3.13
-  elasticsearch-6-alpine313:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions
-      with:
-        version: ${{ env.ELASTICSEARCH6 }}
-        tags: 6.8-alpine3.13,6-alpine3.13
-        alpine_ver: 3.13
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_IMAGE_TAG
 
-FROM wodby/openjdk:${BASE_IMAGE_TAG}
+FROM eclipse-temurin:${BASE_IMAGE_TAG}
 
 ARG ELASTICSEARCH_VER
 

diff --git a/Makefile b/Makefile
@@ -4,8 +4,7 @@ ELASTICSEARCH_VER ?= 7.17.2
 ELASTICSEARCH_MINOR_VER=$(shell echo "${ELASTICSEARCH_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 OPENJDK_VER ?= 11
-ALPINE_VER ?= 3.15
-BASE_IMAGE_TAG ?= $(OPENJDK_VER)-jre-alpine$(ALPINE_VER)
+BASE_IMAGE_TAG ?= $(OPENJDK_VER)-jre-alpine
 
 # Remove minor version from tag
 TAG ?= $(ELASTICSEARCH_MINOR_VER)

diff --git a/README.md b/README.md
@@ -19,8 +19,6 @@ Supported tags and respective `Dockerfile` links:
 
 - `7.17`, `7`, `latest` [_(Dockerfile)_](https://github.com/wodby/elasticsearch/tree/master/Dockerfile)
 - `6.8`, `6` [_(Dockerfile)_](https://github.com/wodby/elasticsearch/tree/master/Dockerfile)
-- `7.17-alpine3.13`, `7-alpine3.13`, `alpine3.13` [_(Dockerfile)_](https://github.com/wodby/elasticsearch/tree/master/Dockerfile)
-- `6.8-alpine3.13`, `6-alpine3.13` [_(Dockerfile)_](https://github.com/wodby/elasticsearch/tree/master/Dockerfile)
 
 ## Environment Variables