From 82c84fcccb17d4e80f5a94f12e4ef557cd3f55ec Mon Sep 17 00:00:00 2001
From: "byte[]" <byteslice@airmail.cc>
Date: Wed, 9 Feb 2022 20:33:10 -0500
Subject: [PATCH] Update to latest S3Proxy

---
 docker-compose.yml                   |  6 +++---
 docker/files/Dockerfile              |  2 --
 docker/files/run-docker-container.sh | 28 ----------------------------
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 docker/files/Dockerfile
 delete mode 100755 docker/files/run-docker-container.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index bb30a25d..88443e52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,9 +77,9 @@ services:
       driver: "none"
 
   files:
-    build:
-      context: .
-      dockerfile: ./docker/files/Dockerfile
+    image: andrewgaul/s3proxy:sha-5aec5c1
+    environment:
+      - JCLOUDS_FILESYSTEM_BASEDIR=/srv/philomena/priv/s3
     volumes:
       - .:/srv/philomena
 
diff --git a/docker/files/Dockerfile b/docker/files/Dockerfile
deleted file mode 100644
index 9316f2c1..00000000
--- a/docker/files/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM andrewgaul/s3proxy:sha-2e61c38
-COPY docker/files/run-docker-container.sh /opt/s3proxy/run-docker-container.sh
diff --git a/docker/files/run-docker-container.sh b/docker/files/run-docker-container.sh
deleted file mode 100755
index 171cbd55..00000000
--- a/docker/files/run-docker-container.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# forked because it doesn't let me configure the filesystem basedir via env
-mkdir -p /srv/philomena/priv/s3
-
-exec java \
-    -DLOG_LEVEL="${LOG_LEVEL}" \
-    -Ds3proxy.endpoint="${S3PROXY_ENDPOINT}" \
-    -Ds3proxy.virtual-host="${S3PROXY_VIRTUALHOST}" \
-    -Ds3proxy.authorization="${S3PROXY_AUTHORIZATION}" \
-    -Ds3proxy.identity="${S3PROXY_IDENTITY}" \
-    -Ds3proxy.credential="${S3PROXY_CREDENTIAL}" \
-    -Ds3proxy.cors-allow-all="${S3PROXY_CORS_ALLOW_ALL}" \
-    -Ds3proxy.cors-allow-origins="${S3PROXY_CORS_ALLOW_ORIGINS}" \
-    -Ds3proxy.cors-allow-methods="${S3PROXY_CORS_ALLOW_METHODS}" \
-    -Ds3proxy.cors-allow-headers="${S3PROXY_CORS_ALLOW_HEADERS}" \
-    -Ds3proxy.ignore-unknown-headers="${S3PROXY_IGNORE_UNKNOWN_HEADERS}" \
-    -Djclouds.provider="${JCLOUDS_PROVIDER}" \
-    -Djclouds.identity="${JCLOUDS_IDENTITY}" \
-    -Djclouds.credential="${JCLOUDS_CREDENTIAL}" \
-    -Djclouds.endpoint="${JCLOUDS_ENDPOINT}" \
-    -Djclouds.region="${JCLOUDS_REGION}" \
-    -Djclouds.regions="${JCLOUDS_REGIONS}" \
-    -Djclouds.keystone.version="${JCLOUDS_KEYSTONE_VERSION}" \
-    -Djclouds.keystone.scope="${JCLOUDS_KEYSTONE_SCOPE}" \
-    -Djclouds.keystone.project-domain-name="${JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME}" \
-    -Djclouds.filesystem.basedir="/srv/philomena/priv/s3" \
-    -jar /opt/s3proxy/s3proxy \
-    --properties /dev/null