1 Commits
Author SHA1 Message Date
marc 8502b7fcb9 no double imports
Docker / build (push) Canceled after 0s
2022-07-28 15:16:31 +02:00
4 changed files with 11 additions and 14 deletions
+4 -4
View File
@@ -20,10 +20,10 @@ buildall: buildbase buildxorg buildvnc buildparabola
updateall:
docker pull archlinux
docker-compose build --no-cache base
docker-compose build --no-cache xorg
docker-compose build --no-cache vnc
docker-compose build --no-cache parabola
docker-compose build --no-cache
# docker-compose build --no-cache xorg
# docker-compose build --no-cache vnc
# docker-compose build --no-cache parabola
docker-compose push
push: buildall
+4 -7
View File
@@ -6,15 +6,14 @@ EXPOSE 5900 8080
ENV DISPLAY=:0.0
# Install packages
RUN paru -Syyyu --noconfirm \
RUN paru -Syyy --noconfirm \
x11vnc \
novnc \
cron \
# xorg-server \
# xorg-server-utils \
ttf-meslo-nerd-font-powerlevel10k \
# xorg-server-xvfb
xf86-video-dummy
xorg-server-xvfb
USER root
COPY crontab.txt /var/spool/cron/marc
@@ -24,8 +23,6 @@ USER marc
COPY supervisord.ini /etc/supervisor.d/supervisord.ini
USER root
RUN pwd
RUN ls
COPY entrypoint.sh /root/entrypoint.sh
ENTRYPOINT [ "/root/entrypoint.sh" ]
COPY entrypoint.sh entrypoint.sh
ENTRYPOINT [ ".//entrypoint.sh" ]
# ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]
+1 -1
View File
@@ -54,6 +54,6 @@ user=root
priority=5
[program:alacritty]
command=alacritty -e neofetch"
command=alacritty -e sh -c "picom -b"
user=marc
priority=5
+2 -2
View File
@@ -1,6 +1,6 @@
FROM marcpartensky/arch
RUN paru -Syyyu --noconfirm \
RUN paru -Syyy --noconfirm \
net-tools \
supervisor \
firefox \
@@ -45,7 +45,7 @@ RUN git clone https://github.com/marcpartensky/shell git/shell
RUN make -C git/shell
USER root
COPY supervisord.ini /etc/supervisor.d/supervisord.ini
COPY entrypoint.sh entrypoint.sh
COPY supervisord.ini /etc/supervisor.d/supervisord.ini
ENTRYPOINT [ "./entrypoint.sh" ]
# ENTRYPOINT [ "DISPLAY=:0", "Xephyr", ":1" ]