From 9057496faaef874e16526fe5109d09a8a4220a6d Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sat, 20 Feb 2021 23:52:40 -0500
Subject: [PATCH] Created org for project
---
Dockerfile | 2 +-
README.rdoc | 9 ++++-----
conf/config.yaml | 2 +-
docker-compose.yml | 13 +++++++++++++
4 files changed, 19 insertions(+), 7 deletions(-)
create mode 100644 docker-compose.yml
diff --git a/Dockerfile b/Dockerfile
index 06f0a57..3f04549 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM archlinux/base
RUN pacman -Sy --noconfirm
-RUN pacman -S --noconfirm ruby git
+RUN pacman -S --noconfirm ruby git base-devel glibc
RUN gem install --no-user-install bundler
# throw errors if Gemfile has been modified since Gemfile.lock
diff --git a/README.rdoc b/README.rdoc
index 5575c37..e89e868 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -33,11 +33,10 @@ Just run the application with the following command.
== Using Docker
- docker run --rm -i -v "$PWD/storage:/usr/src/app/storage" -v "$PWD/conf:/usr/src/app/conf" -v "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions" -t syncleus/aethyr:git bundle exec ./bin/aethyr_setup
- docker run -p 8888:8888 -v "$PWD/storage:/usr/src/app/storage" -v "$PWD/conf:/usr/src/app/conf" -v "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions" --rm syncleus/aethyr:git
+ UID=${UID} GID=${GID} docker-compose run --rm -- aethyr bundle exec ./bin/aethyr_setup
+ UID=${UID} GID=${GID} docker-compose up
== Building image
- docker build -t syncleus/aethyr:git .
- docker login # if not logged in
- docker push syncleus/aethyr:git
+ UID=${UID} GID=${GID} docker-compose build
+ UID=${UID} GID=${GID} docker-compose push
diff --git a/conf/config.yaml b/conf/config.yaml
index af12965..44a01d7 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -9,7 +9,7 @@
:restart_delay: 10
:address: 0.0.0.0
:intro_file: intro.txt
-:start_room: 46cf2781-1e5e-d6e4-18e6-ea72ea437aa9
+:start_room: d135e078-019a-1a4d-be5c-a37aa5304022
:restart_limit: 15
:mccp: false
:mssp: false
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..144b660
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+services:
+ aethyr:
+ image: 'borea/aethyr:latest'
+ build: .
+ ports:
+ - "8888:8888"
+ volumes:
+ - "$PWD/storage:/usr/src/app/storage"
+ - "$PWD/conf:/usr/src/app/conf"
+ - "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions"
+ - "$PWD/logs:/usr/src/app/logs"
+ user: "${UID}:${GID}"
--
GitLab