diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d78b5611abf40e85a21dbc405b68fd7f184f74b..837bce13089d23ecb536c34d8e2a9701e4ef3e07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:20.10.9 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 4.5.0-oidc-4.0.0 + IMAGE_VER: 4.5.0-p2 services: - docker:20.10.9-dind diff --git a/DBIP-City.mmdb b/DBIP-City.mmdb new file mode 100644 index 0000000000000000000000000000000000000000..e691c377275f3857c161c3ed34eb841c564dba9d Binary files /dev/null and b/DBIP-City.mmdb differ diff --git a/Dockerfile b/Dockerfile index 5344f9244a53cc77802c2e9ac84b78b290579006..f10c55be6f505974b6d49cce08aac219f7675942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,3 +2,5 @@ FROM matomo:4.5.0 MAINTAINER Andrej RamaĊĦeuski <andrej.ramaseuski@pirati.cz> COPY LoginOIDC /var/www/html/plugins/LoginOIDC +COPY Provider /var/www/html/plugins/Provider +COPY DBIP-City.mmdb /var/www/html/misc/DBIP-City.mmdb diff --git a/Provider b/Provider new file mode 160000 index 0000000000000000000000000000000000000000..e7ff61fdc9aad1c475aaa0e8cd6a5241c16c82f3 --- /dev/null +++ b/Provider @@ -0,0 +1 @@ +Subproject commit e7ff61fdc9aad1c475aaa0e8cd6a5241c16c82f3