Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Docker Webtop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gilwi36p
Docker Webtop
Commits
a1baba45
Commit
a1baba45
authored
3 years ago
by
thelamer
Browse files
Options
Downloads
Patches
Plain Diff
updating arch kde to new baseimage format with pulse script
parent
dacf12c7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+0
-22
0 additions, 22 deletions
Dockerfile
Dockerfile.aarch64
+0
-22
0 additions, 22 deletions
Dockerfile.aarch64
Dockerfile.armhf
+0
-22
0 additions, 22 deletions
Dockerfile.armhf
root/defaults/startwm.sh
+1
-1
1 addition, 1 deletion
root/defaults/startwm.sh
with
1 addition
and
67 deletions
Dockerfile
+
0
−
22
View file @
a1baba45
...
...
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arch
# set version label
ARG
BUILD_DATE
ARG
VERSION
ARG
XFCE_VERSION
LABEL
build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL
maintainer="thelamer"
RUN
\
echo
"**** install build deps ****"
&&
\
pacman
-Sy
--noconfirm
--needed
\
base-devel
\
git
&&
\
echo
"**** build AUR packages ****"
&&
\
cd
/tmp
&&
\
AUR_PACKAGES
=
"
\
dbus-x11"
&&
\
pacman
-Rns
--noconfirm
-dd
dbus
&&
\
for
PACKAGE
in
${
AUR_PACKAGES
}
;
do
\
git clone https://aur.archlinux.org/
${
PACKAGE
}
.git
&&
\
chown
-R
abc:abc
${
PACKAGE
}
&&
\
cd
${
PACKAGE
}
&&
\
sudo
-u
abc makepkg
-sAci
--skipinteg
--noconfirm
--needed
&&
\
cd
/tmp
;
\
done
&&
\
echo
"**** install packages ****"
&&
\
pacman
-Sy
--noconfirm
--needed
\
discover
\
...
...
@@ -31,13 +14,8 @@ RUN \
firefox
\
kate
\
konsole
\
pavucontrol
\
plasma-desktop
&&
\
echo
"**** cleanup ****"
&&
\
pacman
-Rsn
--noconfirm
\
gcc
\
git
\
$(
pacman
-Qdtq
)
&&
\
rm
-rf
\
/tmp/
*
\
/var/cache/pacman/pkg/
*
\
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.aarch64
+
0
−
22
View file @
a1baba45
...
...
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-arch
# set version label
ARG BUILD_DATE
ARG VERSION
ARG XFCE_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
RUN \
echo "**** install build deps ****" && \
pacman -Sy --noconfirm --needed \
base-devel \
git && \
echo "**** build AUR packages ****" && \
cd /tmp && \
AUR_PACKAGES="\
dbus-x11" && \
pacman -Rns --noconfirm -dd dbus && \
for PACKAGE in ${AUR_PACKAGES}; do \
git clone https://aur.archlinux.org/${PACKAGE}.git && \
chown -R abc:abc ${PACKAGE} && \
cd ${PACKAGE} && \
sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
cd /tmp ;\
done && \
echo "**** install packages ****" && \
pacman -Sy --noconfirm --needed \
discover \
...
...
@@ -31,13 +14,8 @@ RUN \
firefox \
kate \
konsole \
pavucontrol \
plasma-desktop && \
echo "**** cleanup ****" && \
pacman -Rsn --noconfirm \
gcc \
git \
$(pacman -Qdtq) && \
rm -rf \
/tmp/* \
/var/cache/pacman/pkg/* \
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.armhf
+
0
−
22
View file @
a1baba45
...
...
@@ -3,27 +3,10 @@ FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-arch
# set version label
ARG BUILD_DATE
ARG VERSION
ARG XFCE_VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
RUN \
echo "**** install build deps ****" && \
pacman -Sy --noconfirm --needed \
base-devel \
git && \
echo "**** build AUR packages ****" && \
cd /tmp && \
AUR_PACKAGES="\
dbus-x11" && \
pacman -Rns --noconfirm -dd dbus && \
for PACKAGE in ${AUR_PACKAGES}; do \
git clone https://aur.archlinux.org/${PACKAGE}.git && \
chown -R abc:abc ${PACKAGE} && \
cd ${PACKAGE} && \
sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
cd /tmp ;\
done && \
echo "**** install packages ****" && \
pacman -Sy --noconfirm --needed \
discover \
...
...
@@ -31,13 +14,8 @@ RUN \
firefox \
kate \
konsole \
pavucontrol \
plasma-desktop && \
echo "**** cleanup ****" && \
pacman -Rsn --noconfirm \
gcc \
git \
$(pacman -Qdtq) && \
rm -rf \
/tmp/* \
/var/cache/pacman/pkg/* \
...
...
This diff is collapsed.
Click to expand it.
root/defaults/startwm.sh
+
1
−
1
View file @
a1baba45
#!/bin/bash
PULSE_SCRIPT
=
/etc/xrdp/pulse/default.pa /
usr/bin/pulseaudio
--start
PULSE_SCRIPT
=
/etc/xrdp/pulse/default.pa /
startpulse.sh
--start
&
/usr/bin/startplasma-x11
>
/dev/null 2>&1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment