Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #346 from PabloCastellano/docker-fix

Browse Source 
Fix docker build
This commit is contained in:
Nathan.fooo 2022-02-21 10:22:11 +08:00 committed by GitHub
commit 7eada39a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/scripts/docker-buildfiles/Dockerfile
View File

@ -1,12 +1,12 @@
FROM archlinux/archlinux:base-devel FROM archlinux/archlinux:base-devel
RUN pacman -Syy RUN pacman -Syy
RUN pacman -Syu --needed --noconfirm git xdg-user-dirs RUN pacman -Syu --needed --noconfirm git xdg-user-dirs
# makepkg user and workdir # makepkg user and workdir
ARG user=makepkg ARG user=makepkg
ENV PATH="/home/makepkg/.local/flutter/bin:/home/makepkg/.local/flutter/bin/cache/dart-sdk/bin:${PATH}" ENV PATH="/home/makepkg/.pub-cache/bin:/home/makepkg/.local/flutter/bin:/home/makepkg/.local/flutter/bin/cache/dart-sdk/bin:${PATH}"
RUN useradd --system --create-home $user \ RUN useradd --system --create-home $user \
&& echo "$user ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers.d/$user && echo "$user ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers.d/$user
USER $user USER $user
@ -17,7 +17,7 @@ RUN git clone https://aur.archlinux.org/yay.git \
&& cd yay \ && cd yay \
&& makepkg -sri --needed --noconfirm \ && makepkg -sri --needed --noconfirm \
&& cd \ && cd \
&& rm -rf .cache yay && rm -rf .cache yay
RUN yay -S --noconfirm curl base-devel sqlite openssl clang cmake ninja pkg-config gtk3 unzip RUN yay -S --noconfirm curl base-devel sqlite openssl clang cmake ninja pkg-config gtk3 unzip
RUN xdg-user-dirs-update RUN xdg-user-dirs-update
@ -25,8 +25,9 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN source $HOME/.cargo/env && rustup toolchain install stable && rustup default stable RUN source $HOME/.cargo/env && rustup toolchain install stable && rustup default stable
RUN git clone https://github.com/flutter/flutter.git $HOME/.local/flutter RUN git clone https://github.com/flutter/flutter.git $HOME/.local/flutter
RUN flutter channel stable RUN flutter channel stable
RUN flutter config --enable-linux-desktop RUN flutter config --enable-linux-desktop
RUN flutter doctor RUN flutter doctor
RUN dart pub global activate protoc_plugin
RUN git clone https://github.com/AppFlowy-IO/appflowy.git && \ RUN git clone https://github.com/AppFlowy-IO/appflowy.git && \
cd appflowy/frontend && \ cd appflowy/frontend && \

11
frontend/scripts/docker-buildfiles/docker-compose.yml
View File

@ -3,10 +3,17 @@ version: "3"
services: services:
app: app:
build: . build: .
stdin_open: true stdin_open: true
# tty: true # tty: true
environment: environment:
- DISPLAY=${DISPLAY} - DISPLAY=${DISPLAY}
volumes: volumes:
- $HOME/.Xauthority:/root/.Xauthority:rw - $HOME/.Xauthority:/root/.Xauthority:rw
network_mode: host - /tmp/.X11-unix:/tmp/.X11-unix
- /dev/dri:/dev/dri
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
- appflowy-data:/home/makepkg
network_mode: host
volumes:
appflowy-data: