Consolidated Dockerfiles with OAuth Proxy

curityio · Sep 4, 2024 · bfdf8b6 · bfdf8b6
1 parent 551ec08
commit bfdf8b6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/builders/alpine.Dockerfile b/builders/alpine.Dockerfile
@@ -1,8 +1,8 @@
-FROM alpine
+FROM alpine:3
 
 RUN apk add --no-cache --virtual .build-deps \
     gcc libc-dev make pcre2-dev zlib-dev linux-headers libxslt-dev \
-    gd-dev geoip-dev perl-dev libedit-dev mercurial bash alpine-sdk findutils bash
+    gd-dev geoip-dev perl-dev libedit-dev mercurial alpine-sdk findutils bash
 
 COPY configure /tmp
 COPY config /tmp

diff --git a/builders/amazon2.Dockerfile b/builders/amazon2.Dockerfile
@@ -1,7 +1,7 @@
 FROM amazonlinux:2
 
 RUN yum install -y \
- gcc pcre-devel zlib-devel make
+ gcc pcre2-devel zlib-devel make
 
 COPY configure /tmp
 COPY config /tmp

diff --git a/builders/amazon2023.Dockerfile b/builders/amazon2023.Dockerfile
@@ -1,7 +1,7 @@
 FROM amazonlinux:2023
 
 RUN yum install -y \
- gcc pcre-devel zlib-devel make
+ gcc pcre2-devel zlib-devel make
 
 COPY configure /tmp
 COPY config /tmp

diff --git a/builders/centosstream9.Dockerfile b/builders/centosstream9.Dockerfile
@@ -1,7 +1,7 @@
 FROM quay.io/centos/centos:stream9
 
 RUN yum install -y \
-     gcc pcre-devel zlib-devel make
+     gcc pcre2-devel zlib-devel make
 
 COPY configure /tmp
 COPY config /tmp

diff --git a/testing/test/curity-test-config.xml → testing/curity-test-config.xml b/testing/test/curity-test-config.xml → testing/curity-test-config.xml
diff --git a/testing/test/docker-compose.yaml b/testing/test/docker-compose.yaml
@@ -18,4 +18,4 @@ services:
       - LICENSE_KEY=${LICENSE_KEY:?err}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD:?err}
     volumes:
-      - ./curity-test-config.xml:/opt/idsvr/etc/init/curity-test-config.xml
+      - ../curity-test-config.xml:/opt/idsvr/etc/init/curity-test-config.xml