Skip to content

Commit ea497c5

Browse files
committed
Add garage and stop starting dockerd
1 parent 3637490 commit ea497c5

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

addons8/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ RUN dnf install -y \
1212
curl -kLO ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8b.tar.gz &&\
1313
tar xf proftpd-1.3.8b.tar.gz && cd proftpd-1.3.8b &&\
1414
./configure --prefix=/usr/local --enable-dso --enable-openssl --with-pic --enable-nls --with-modules=mod_tls &&\
15-
make && make install && cd .. && rm -rf proftpd-*
15+
make && make install && cd .. && rm -rf proftpd-* &&\
16+
curl -LO https://garagehq.deuxfleurs.fr/_releases/v2.1.0/`uname -m`-unknown-linux-musl/garage &&\
17+
chmod +x garage && mv garage /usr/local/bin
1618

1719
COPY ./docker-entrypoint.sh /
1820
ENTRYPOINT ["/docker-entrypoint.sh"]

addons8/docker-entrypoint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ mysql -e "grant all privileges on mt_test.* to mt@localhost;"
1717

1818
memcached -d -u root
1919

20-
dockerd &
21-
2220
if [ -f t/cpanfile ]; then
2321
cpanm --installdeps -n . --cpanfile=t/cpanfile
2422
fi

0 commit comments

Comments
 (0)