Skip to content
This repository has been archived by the owner on Jun 2, 2023. It is now read-only.

Commit

Permalink
* MRADEV-682: update fakes3 to version 1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cpretzer committed Apr 26, 2018
1 parent 6e509ae commit 4b0de94
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -3,3 +3,5 @@ tests/package-lock.json
rethinkdb
mysql
dynamo_db
mra-ingenious.iml

15 changes: 15 additions & 0 deletions base_images/fake-s3/Dockerfile
@@ -0,0 +1,15 @@
FROM ruby:2.5-alpine
MAINTAINER NGINX Professional Services <support@nginxps.com>

# install Ruby
RUN apk update

# install fake-s3
RUN gem install fakes3 -v 1.2.1

# run fake-s3
RUN mkdir -p /fakes3_root && \
which fakes3
ENTRYPOINT ["fakes3"]
CMD ["-r", "/fakes3_root", "-p", "4569"]
EXPOSE 4569
2 changes: 1 addition & 1 deletion docker-compose-oss.yaml
Expand Up @@ -101,7 +101,7 @@ services:

# Fake S3
fake-s3:
image: docker.io/lphoward/fake-s3:latest
image: nginxinc/mra-fakes3:1.2.1
container_name: fake-s3
ports:
- "4569:4569"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Expand Up @@ -98,7 +98,7 @@ services:

# Fake S3
fake-s3:
image: docker.io/lphoward/fake-s3:latest
image: nginxinc/mra-fakes3:1.2.1
container_name: fake-s3
ports:
- "4569:4569"
Expand Down
23 changes: 11 additions & 12 deletions mra-ingenious.iml
Expand Up @@ -3,19 +3,18 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/dynamo_db" />
<excludeFolder url="file://$MODULE_DIR$/fakes3" />
<excludeFolder url="file://$MODULE_DIR$/mra-album-manager" />
<excludeFolder url="file://$MODULE_DIR$/mra-auth-proxy" />
<excludeFolder url="file://$MODULE_DIR$/mra-content-service" />
<excludeFolder url="file://$MODULE_DIR$/mra-pages" />
<excludeFolder url="file://$MODULE_DIR$/mra-photoresizer" />
<excludeFolder url="file://$MODULE_DIR$/mra-photouploader" />
<excludeFolder url="file://$MODULE_DIR$/mra-user-manager" />
<excludeFolder url="file://$MODULE_DIR$/mysql" />
<excludeFolder url="file://$MODULE_DIR$/rethinkdb" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="PHARS">
<CLASSES>
<root url="phar://$MODULE_DIR$/mra-pages/ingenious-pages/composer.phar/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="phar://$MODULE_DIR$/mra-pages/ingenious-pages/composer.phar/" />
</SOURCES>
</library>
</orderEntry>
</component>
</module>

0 comments on commit 4b0de94

Please sign in to comment.