From ec354fb2651a95bacd43be2930675aa4ef6eb933 Mon Sep 17 00:00:00 2001
From: Ethan Ho <53266718+ethho@users.noreply.github.com>
Date: Tue, 16 Jan 2024 22:20:11 -0700
Subject: [PATCH] Version tick to 0.1.5

---
 docker-compose.yml        | 6 ++++--
 docker/percona.dockerfile | 8 +++-----
 pam-oidc/Cargo.toml       | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7b5d3bd..5a1298f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,8 @@ services:
     build:
       context: .
       dockerfile: docker/percona.dockerfile
+      args:
+        - BUILDER_TAG=${DOCKER_TAG:-v0.1.5}
     environment:
       - MYSQL_ROOT_PASSWORD=password
     env_file:
@@ -24,10 +26,10 @@ services:
     depends_on:
       builder:
         condition: service_completed_successfully
-    image: datajoint/pam-oauth2-percona:${DOCKER_TAG:-v0.1.4}
+    image: datajoint/pam-oauth2-percona:${DOCKER_TAG:-v0.1.5}
   builder:
     container_name: pam-oauth2-builder
     build:
       context: .
       dockerfile: docker/builder.dockerfile
-    image: datajoint/pam-oauth2-builder:${DOCKER_TAG:-v0.1.4}
+    image: datajoint/pam-oauth2-builder:${DOCKER_TAG:-v0.1.5}
diff --git a/docker/percona.dockerfile b/docker/percona.dockerfile
index a55177e..ad5798e 100644
--- a/docker/percona.dockerfile
+++ b/docker/percona.dockerfile
@@ -1,7 +1,7 @@
-FROM datajoint/pam-oauth2-builder:v0.1.4 as builder
+ARG BUILDER_TAG
+FROM datajoint/pam-oauth2-builder:${BUILDER_TAG} as builder
 FROM percona:8
 USER root
-
 RUN \
 	yum -y install python3 python3-pip && \
 	pip3 install python-pam
@@ -18,10 +18,8 @@ RUN \
 	echo "ap_user:password" | chpasswd
 USER mysql:mysql
 
-# Copy the binary from the builder stage
-COPY --from=builder /tmp/pam-oauth2/libpam_oidc_gnu.so /usr/lib64/security/libpam_oidc.so
-
 # https://docs.percona.com/percona-server/8.0/pam-plugin.html#installation
+COPY --from=builder /tmp/pam-oauth2/libpam_oidc_gnu.so /usr/lib64/security/libpam_oidc.so
 RUN echo 'plugin_load_add = auth_pam.so' >> /etc/my.cnf
 COPY config/pam_unix /etc/pam.d/mysqld
 COPY config/service_example /etc/pam.d/oidc
\ No newline at end of file
diff --git a/pam-oidc/Cargo.toml b/pam-oidc/Cargo.toml
index 77771d7..86ca905 100644
--- a/pam-oidc/Cargo.toml
+++ b/pam-oidc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pam-oidc"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["guzman-raphael <raphael.h.guzman@gmail.com>"]
 edition = "2021"