Skip to content

Commit

Permalink
[hotfix] use adoptopenjdk/openjdk8-openj9:alpine base image for all D…
Browse files Browse the repository at this point in the history
…ockerfiles
  • Loading branch information
Patrick Wiener committed Nov 11, 2020
1 parent 7ded342 commit b0b157a
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variables:
GIT_REPO_ORIGIN: $GIT_REPO_ORIGIN
GIT_STRATEGY: clone
DOCKER_CLI_EXPERIMENTAL: enabled
BASE_IMAGE_AMD64: adoptopenjdk/openjdk8-openj9:alpine-slim
BASE_IMAGE_AMD64: adoptopenjdk/openjdk8-openj9:alpine
BASE_IMAGE_ARM32v7: arm32v7/openjdk:11-jre-slim
BASE_IMAGE_ARM64v8: arm64v8/openjdk:11-jre-slim
BASE_NGINX_AMD64: nginx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk8-openj9:alpine-slim
FROM adoptopenjdk/openjdk8-openj9:alpine

EXPOSE 8090
ENV CONSUL_LOCATION consul
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk8-openj9:alpine-slim
FROM adoptopenjdk/openjdk8-openj9:alpine

EXPOSE 8090
ENV CONSUL_LOCATION consul
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk8-openj9:alpine-slim
FROM adoptopenjdk/openjdk8-openj9:alpine

EXPOSE 8090
ENV CONSUL_LOCATION consul
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk8-openj9:alpine-slim
FROM adoptopenjdk/openjdk8-openj9:alpine

EXPOSE 8090
ENV CONSUL_LOCATION consul
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM adoptopenjdk/openjdk8-openj9:alpine-slim
FROM adoptopenjdk/openjdk8-openj9:alpine

ENV CONSUL_LOCATION consul
EXPOSE 8090
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
context: ./streampipes-backend
dockerfile: Dockerfile
args:
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine-slim
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
image: incubator-streampipes_backend:release-validation
depends_on:
- consul
Expand All @@ -56,7 +56,7 @@ services:
context: ./streampipes-connect-container-master
dockerfile: Dockerfile
args:
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine-slim
BASE_IMAGE: adoptopenjdk/openjdk8-openj9:alpine
image: incubator-streampipes_connect-master:release-validation
depends_on:
- consul
Expand Down
2 changes: 1 addition & 1 deletion streampipes-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine-slim
ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine
FROM $BASE_IMAGE

EXPOSE 8030
Expand Down
2 changes: 1 addition & 1 deletion streampipes-connect-container-master/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine-slim
ARG BASE_IMAGE=adoptopenjdk/openjdk8-openj9:alpine
FROM $BASE_IMAGE

ENV CONSUL_LOCATION consul
Expand Down

0 comments on commit b0b157a

Please sign in to comment.