external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Docker: remove web/locale from volume mounts

Browse source 
This caused a bug where generated locale would not be used.

Also, removed appending to /etc/hosts which was bugging out
on Mac OS X. archlinux:base-devel seems to come with a valid
/etc/hosts.

Additionally, remove AUR_CONFIG from Dockerfile. We don't
set it up; just use the defaults during installation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-06-26 00:33:32 -07:00
parent ff3519ae11
commit 9ee7be4a1c
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -1,8 +1,6 @@
FROM archlinux:base-devel FROM archlinux:base-devel
# Setup some default system stuff. # Setup some default system stuff.
RUN bash -c 'echo "127.0.0.1 localhost" >> /etc/hosts'
RUN bash -c 'echo "::1 localhost" >> /etc/hosts'
RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
RUN mkdir -p .pkg-cache RUN mkdir -p .pkg-cache
@ -28,6 +26,5 @@ WORKDIR /aurweb
COPY . . COPY . .
ENV PYTHONPATH=/aurweb ENV PYTHONPATH=/aurweb
ENV AUR_CONFIG=conf/config
RUN make -C po all install RUN make -C po all install

28
docker-compose.yml
View file

@ -116,7 +116,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
fastapi: fastapi:
@ -148,7 +150,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
nginx: nginx:
@ -180,7 +184,9 @@ services:
- git_data:/aurweb/aur.git - git_data:/aurweb/aur.git
- ./cache:/cache - ./cache:/cache
- ./logs:/var/log/nginx - ./logs:/var/log/nginx
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
sharness: sharness:
image: aurweb:latest image: aurweb:latest
@ -202,7 +208,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
pytest-mysql: pytest-mysql:
@ -229,7 +237,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
pytest-sqlite: pytest-sqlite:
@ -248,7 +258,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
depends_on: depends_on:
git: git:
@ -277,7 +289,9 @@ services:
- ./aurweb:/aurweb/aurweb - ./aurweb:/aurweb/aurweb
- ./migrations:/aurweb/migrations - ./migrations:/aurweb/migrations
- ./test:/aurweb/test - ./test:/aurweb/test
- ./web:/aurweb/web - ./web/html:/aurweb/web/html
- ./web/template:/aurweb/web/template
- ./web/lib:/aurweb/web/lib
- ./templates:/aurweb/templates - ./templates:/aurweb/templates
volumes: volumes: