Merge branch 'master' of gitlab.com:alemaire/buildx

This commit is contained in:
Adrien le Maire 2020-08-20 10:47:23 +02:00
commit 8ac912a556
2 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
.DEFAULT: all .DEFAULT: all
.PHONY: mc keycloak pgadmin4 .PHONY: mc keycloak pgadmin4 unifi
all: mc keycloak pgadmin4 all: mc keycloak pgadmin4 unifi
include */Makefile include */Makefile

View File

@ -1,13 +1,13 @@
FROM debian:stable-20200720-slim FROM debian:buster-20200803-slim
ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem
ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem
ARG KEYCLOAK_VERSION ARG KEYCLOAK_VERSION
ENV KEYCLOAK_VERSION $KEYCLOAK_VERSION ENV KEYCLOAK_VERSION $KEYCLOAK_VERSION
ENV JDBC_POSTGRES_VERSION 42.2.9 ENV JDBC_POSTGRES_VERSION 42.2.14
ENV JDBC_MYSQL_VERSION 8.0.20 ENV JDBC_MYSQL_VERSION 8.0.21
ENV JDBC_MARIADB_VERSION 2.6.1 ENV JDBC_MARIADB_VERSION 2.6.2
ENV JDBC_MSSQL_VERSION 8.2.2.jre11 ENV JDBC_MSSQL_VERSION 8.4.0.jre11
ENV LAUNCH_JBOSS_IN_BACKGROUND 1 ENV LAUNCH_JBOSS_IN_BACKGROUND 1
ENV PROXY_ADDRESS_FORWARDING false ENV PROXY_ADDRESS_FORWARDING false