Skip to content

Commit ebf0b2e

Browse files
uparrowsuparrows
committed
test
1 parent 5a2fb4b commit ebf0b2e

7 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ADD https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY
4040
RUN tar -C / -xzf /tmp/s6-overlay-nobin.tar.gz && rm -f /tmp/s6-overlay-nobin.tar.gz
4141

4242

43-
WORKDIR /home/dezhao/lanraragi
43+
WORKDIR /root/lanraragi
4444

4545
#Copy cpanfile and install script before copying the entire context
4646
#This allows for Docker cache to preserve cpan dependencies
@@ -49,7 +49,7 @@ COPY --chown=root:root /package.json package.json
4949

5050
# Run the install script as root
5151
RUN sh ./tools/install-everything.sh
52-
RUN rm -f /home/dezhao/lanraragi/public/js/vendor/jquery.dataTables.min.js
52+
RUN rm -f /root/lanraragi/public/js/vendor/jquery.dataTables.min.js
5353
#Copy remaining LRR files from context
5454
# consider chowning in s6 setup scripts instead
5555
COPY --chown=root:root /lib lib
@@ -62,9 +62,9 @@ COPY --chown=root:root /tools/build/docker/redis.conf tools/build/docker/
6262
COPY /tools/build/docker/wsl.conf /etc/wsl.conf
6363
COPY /tools/build/docker/s6/cont-init.d/ /etc/cont-init.d/
6464
COPY /tools/build/docker/s6/services.d/ /etc/services.d/
65-
COPY --chown=root:root /jquery.dataTables.min.js /home/dezhao/lanraragi/public/js/vendor/jquery.dataTables.min.js
65+
COPY --chown=root:root /jquery.dataTables.min.js /root/lanraragi/public/js/vendor/jquery.dataTables.min.js
6666
#COPY /tools/build/docker/s6/fix-attrs.d/ /etc/fix-attrs.d/
6767

6868
# Persistent volumes
69-
VOLUME [ "/home/dezhao/lanraragi/content" ]
70-
VOLUME [ "/home/dezhao/lanraragi/database"]
69+
VOLUME [ "/root/lanraragi/content" ]
70+
VOLUME [ "/root/lanraragi/database"]

‎tools/build/docker/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ADD https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY
4040
RUN tar -C / -xzf /tmp/s6-overlay-nobin.tar.gz && rm -f /tmp/s6-overlay-nobin.tar.gz
4141

4242

43-
WORKDIR /home/dezhao/lanraragi
43+
WORKDIR /root/lanraragi
4444

4545
#Copy cpanfile and install script before copying the entire context
4646
#This allows for Docker cache to preserve cpan dependencies
@@ -49,7 +49,7 @@ COPY --chown=root:root /package.json package.json
4949

5050
# Run the install script as root
5151
RUN sh ./tools/install-everything.sh
52-
RUN rm -f /home/dezhao/lanraragi/public/js/vendor/jquery.dataTables.min.js
52+
RUN rm -f /root/lanraragi/public/js/vendor/jquery.dataTables.min.js
5353
#Copy remaining LRR files from context
5454
# consider chowning in s6 setup scripts instead
5555
COPY --chown=root:root /lib lib
@@ -62,9 +62,9 @@ COPY --chown=root:root /tools/build/docker/redis.conf tools/build/docker/
6262
COPY /tools/build/docker/wsl.conf /etc/wsl.conf
6363
COPY /tools/build/docker/s6/cont-init.d/ /etc/cont-init.d/
6464
COPY /tools/build/docker/s6/services.d/ /etc/services.d/
65-
COPY --chown=root:root /jquery.dataTables.min.js /home/dezhao/lanraragi/public/js/vendor/jquery.dataTables.min.js
65+
COPY --chown=root:root /jquery.dataTables.min.js /root/lanraragi/public/js/vendor/jquery.dataTables.min.js
6666
#COPY /tools/build/docker/s6/fix-attrs.d/ /etc/fix-attrs.d/
6767

6868
# Persistent volumes
69-
VOLUME [ "/home/dezhao/lanraragi/content" ]
70-
VOLUME [ "/home/dezhao/lanraragi/database"]
69+
VOLUME [ "/root/lanraragi/content" ]
70+
VOLUME [ "/root/lanraragi/database"]

‎tools/build/docker/redis.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ loglevel notice
168168
# Specify the log file name. Also the empty string can be used to force
169169
# Redis to log on the standard output. Note that if you use standard
170170
# output for logging but daemonize, logs will be sent to /dev/null
171-
logfile /home/dezhao/lanraragi/log/redis.log
171+
logfile /root/lanraragi/log/redis.log
172172

173173
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
174174
# and optionally update the other syslog parameters to suit your needs.
@@ -259,7 +259,7 @@ dbfilename database.rdb
259259
# The Append Only File will also be created inside this directory.
260260
#
261261
# Note that you must specify a directory here, not a file name.
262-
dir /home/dezhao/lanraragi/database
262+
dir /root/lanraragi/database
263263

264264
################################# REPLICATION #################################
265265

‎tools/build/docker/s6/cont-init.d/01-lrr-setup‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,38 @@
33

44

55
#Ensure LRR folder is writable
6-
chown root /home/dezhao/lanraragi
7-
chmod u+rwx /home/dezhao/lanraragi
6+
chown root /root/lanraragi
7+
chmod u+rwx /root/lanraragi
88

99
#Crash with an error if content folder doesn't exist
10-
if [ ! -d "/home/dezhao/lanraragi/content" ]; then
10+
if [ ! -d "/root/lanraragi/content" ]; then
1111
echo "Content folder doesn't exist! Please ensure your Docker mappings are correct."
1212
exit 1
1313
fi
1414

1515
#Ensure database is writable
16-
chown -R root /home/dezhao/lanraragi/database
17-
chmod -R 777 /home/dezhao/lanraragi/database
16+
chown -R root /root/lanraragi/database
17+
chmod -R 777 /root/lanraragi/database
1818

1919
#Ensure thumbnail folder is writable
20-
chmod -R 744 /home/dezhao/lanraragi/content/thumb
21-
find /home/dezhao/lanraragi/content/thumb -type f -exec chmod u+rw {} \;
22-
find /home/dezhao/lanraragi/content/thumb -type d -exec chmod u+rwx {} \;
20+
chmod -R 744 /root/lanraragi/content/thumb
21+
find /root/lanraragi/content/thumb -type f -exec chmod u+rw {} \;
22+
find /root/lanraragi/content/thumb -type d -exec chmod u+rwx {} \;
2323

2424
#Ensure log folder is writable
25-
mkdir /home/dezhao/lanraragi/log
26-
chown -R root /home/dezhao/lanraragi/log
27-
chmod u+rwx /home/dezhao/lanraragi/log
25+
mkdir /root/lanraragi/log
26+
chown -R root /root/lanraragi/log
27+
chmod u+rwx /root/lanraragi/log
2828

2929
#Ensure temp folder is writable
30-
mkdir /home/dezhao/lanraragi/public/temp
31-
chown -R root /home/dezhao/lanraragi/public/temp
32-
chmod u+rwx /home/dezhao/lanraragi/public/temp
30+
mkdir /root/lanraragi/public/temp
31+
chown -R root /root/lanraragi/public/temp
32+
chmod u+rwx /root/lanraragi/public/temp
3333

3434
#Remove mojo, minion and shinobu pid files
35-
rm /home/dezhao/lanraragi/public/temp/server.pid
36-
rm /home/dezhao/lanraragi/public/temp/shinobu.pid
37-
rm /home/dezhao/lanraragi/public/temp/minion.pid
35+
rm /root/lanraragi/public/temp/server.pid
36+
rm /root/lanraragi/public/temp/shinobu.pid
37+
rm /root/lanraragi/public/temp/minion.pid
3838

3939
# https://redis.io/topics/faq#background-saving-fails-with-a-fork-error-under-linux-even-if-i-have-a-lot-of-free-ram
4040
OVERCOMMIT=$(cat /proc/sys/vm/overcommit_memory)

‎tools/build/docker/s6/fix-attrs.d/01-lrr-dirs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# second field in user is fallback uid
22
# path recurse user fperm dperm
3-
/home/dezhao/lanraragi false root,0:0 0644 0744
4-
/home/dezhao/lanraragi/database true root,0:0 0777 0777
5-
/home/dezhao/lanraragi/content/thumb true root,0:0 0644 0744
6-
/home/dezhao/lanraragi/log false root,0:0 0644 0744
7-
/home/dezhao/lanraragi/public/temp false root,0:0 0644 0744
3+
/root/lanraragi false root,0:0 0644 0744
4+
/root/lanraragi/database true root,0:0 0777 0777
5+
/root/lanraragi/content/thumb true root,0:0 0644 0744
6+
/root/lanraragi/log false root,0:0 0644 0744
7+
/root/lanraragi/public/temp false root,0:0 0644 0744

‎tools/build/docker/s6/services.d/lanraragi/run‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
2-
cd /home/dezhao/lanraragi/
2+
cd /root/lanraragi/
33
export HOME=/root
4-
perl /home/dezhao/lanraragi/script/launcher.pl -f /home/dezhao/lanraragi/script/lanraragi
4+
perl /root/lanraragi/script/launcher.pl -f /root/lanraragi/script/lanraragi

‎tools/build/docker/s6/services.d/redis/run‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
/usr/bin/redis-server /home/dezhao/lanraragi/tools/build/docker/redis.conf
2+
/usr/bin/redis-server /root/lanraragi/tools/build/docker/redis.conf

0 commit comments

Comments
 (0)