nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-10-02 19:45:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #153 from nextcloud/enh/noid/fix-containers-for-arm64

Browse source 
fix containers for arm64
This commit is contained in:
Simon L 2022-01-19 13:55:06 +01:00 • committed by GitHub
commit a636e36c89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Containers/apache/Dockerfile
View file

@ -20,7 +20,9 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN wget "https://caddyserver.com/api/download?os=linux&arch=amd64" -O "/usr/bin/caddy" \ ENV DEB_HOST_ARCH="$(dpkg-architecture --query DEB_HOST_ARCH)"
RUN wget "https://caddyserver.com/api/download?os=linux&arch=$DEB_HOST_ARCH" -O "/usr/bin/caddy" \
&& chmod +x /usr/bin/caddy \ && chmod +x /usr/bin/caddy \
&& /usr/bin/caddy version && /usr/bin/caddy version

7
Containers/mastercontainer/Dockerfile
View file

@ -22,7 +22,9 @@ RUN apt-get update; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN curl "https://caddyserver.com/api/download?os=linux&arch=amd64" -o "/usr/bin/caddy" \ ENV DEB_HOST_ARCH="$(dpkg-architecture --query DEB_HOST_ARCH)"
RUN curl "https://caddyserver.com/api/download?os=linux&arch=$DEB_HOST_ARCH" -o "/usr/bin/caddy" \
&& chmod +x /usr/bin/caddy \ && chmod +x /usr/bin/caddy \
&& /usr/bin/caddy version && /usr/bin/caddy version
@ -67,8 +69,7 @@ RUN rm /etc/apache2/ports.conf; \
RUN a2dissite 000-default && \ RUN a2dissite 000-default && \
a2dissite default-ssl && \ a2dissite default-ssl && \
a2ensite mastercontainer.conf && \ a2ensite mastercontainer.conf
service apache2 restart
RUN mkdir /var/log/supervisord; \ RUN mkdir /var/log/supervisord; \
mkdir /var/run/supervisord; mkdir /var/run/supervisord;