Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 9b89638

Browse files
author
Carlos Hernandez
committed
Merge branch 'master' of git://github.com/linuxserver/docker-baseimage-gui
* 'master' of git://github.com/linuxserver/docker-baseimage-gui: re-styling dockerfiles to fit in with LSIO, fixing base image for aarch64, removing license, adding templated files
2 parents 0ffdbf7 + 481dae4 commit 9b89638

File tree

8 files changed

+263
-211
lines changed

8 files changed

+263
-211
lines changed

‎Dockerfile‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
# docker-baseimage-gui
2-
FROM lsiobase/ubuntu:amd64-bionic
3-
MAINTAINER Carlos Hernandez <carlos@techbyte.ca>
1+
FROM lsiobase/ubuntu:bionic
42

5-
#########################################
6-
## ARGUMENTS ##
7-
#########################################
8-
ARG DEBIAN_FRONTEND=noninteractive
3+
# set version label
94
ARG BUILD_DATE
105
ARG VERSION
116
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
127
LABEL maintainer="HurricaneHrndz"
138

14-
#########################################
15-
## INSTALL DEPENDENCIES ##
16-
#########################################
17-
RUN apt-get update \
18-
&& apt-get -y upgrade \
19-
&& apt-get install -qy --no-install-recommends \
9+
RUN \
10+
echo "**** install deps ****" && \
11+
apt-get update && \
12+
apt-get install -qy --no-install-recommends \
2013
ca-certificates \
2114
fuse \
2215
gawk \
@@ -34,13 +27,16 @@ RUN apt-get update \
3427
xrdp \
3528
xserver-xorg-core \
3629
xutils \
37-
zlib1g \
38-
&& apt-get clean -y \
39-
&& apt-get autoremove -y \
40-
&& rm -rf /tmp/* /var/tmp/* \
41-
&& rm -rf /var/lib/apt/lists/*
30+
zlib1g && \
31+
echo "**** clean up ****" && \
32+
rm -rf \
33+
/tmp/* \
34+
/var/lib/apt/lists/* \
35+
/var/tmp/*
4236

43-
COPY root /
44-
VOLUME [ "/config" ]
37+
# add local files
38+
COPY /root /
39+
40+
# ports and volumes
4541
EXPOSE 3389
46-
ENTRYPOINT ["/init"]
42+
VOLUME /config

‎Dockerfile.aarch64‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
# docker-baseimage-gui
2-
FROM lsiobase/ubuntu:aarch64-bionic
3-
MAINTAINER Carlos Hernandez <carlos@techbyte.ca>
1+
FROM lsiobase/ubuntu:arm64v8-bionic
42

5-
#########################################
6-
## ARGUMENTS ##
7-
#########################################
8-
ARG DEBIAN_FRONTEND=noninteractive
3+
# set version label
94
ARG BUILD_DATE
105
ARG VERSION
116
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
127
LABEL maintainer="HurricaneHrndz"
138

14-
#########################################
15-
## INSTALL DEPENDENCIES ##
16-
#########################################
17-
RUN apt-get update \
18-
&& apt-get -y upgrade \
19-
&& apt-get install -qy --no-install-recommends \
9+
RUN \
10+
echo "**** install deps ****" && \
11+
apt-get update && \
12+
apt-get install -qy --no-install-recommends \
2013
autocutsel \
2114
ca-certificates \
2215
curl \
@@ -36,13 +29,16 @@ RUN apt-get update \
3629
xrdp \
3730
xserver-xorg-core \
3831
xutils \
39-
zlib1g \
40-
&& apt-get clean -y \
41-
&& apt-get autoremove -y \
42-
&& rm -rf /tmp/* /var/tmp/* \
43-
&& rm -rf /var/lib/apt/lists/*
32+
zlib1g && \
33+
echo "**** clean up ****" && \
34+
rm -rf \
35+
/tmp/* \
36+
/var/lib/apt/lists/* \
37+
/var/tmp/*
4438

45-
COPY root /
46-
VOLUME [ "/config" ]
39+
# add local files
40+
COPY /root /
41+
42+
# ports and volumes
4743
EXPOSE 3389
48-
ENTRYPOINT ["/init"]
44+
VOLUME /config

‎Dockerfile.armhf‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
# docker-baseimage-gui
21
FROM lsiobase/ubuntu:arm32v7-bionic
3-
MAINTAINER Carlos Hernandez <carlos@techbyte.ca>
42

5-
#########################################
6-
## ARGUMENTS ##
7-
#########################################
8-
ARG DEBIAN_FRONTEND=noninteractive
3+
# set version label
94
ARG BUILD_DATE
105
ARG VERSION
116
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
127
LABEL maintainer="HurricaneHrndz"
138

14-
#########################################
15-
## INSTALL DEPENDENCIES ##
16-
#########################################
17-
RUN apt-get update \
18-
&& apt-get -y upgrade \
19-
&& apt-get install -qy --no-install-recommends \
9+
RUN \
10+
echo "**** install deps ****" && \
11+
apt-get update && \
12+
apt-get install -qy --no-install-recommends \
2013
autocutsel \
2114
ca-certificates \
2215
curl \
@@ -36,13 +29,16 @@ RUN apt-get update \
3629
xrdp \
3730
xserver-xorg-core \
3831
xutils \
39-
zlib1g \
40-
&& apt-get clean -y \
41-
&& apt-get autoremove -y \
42-
&& rm -rf /tmp/* /var/tmp/* \
43-
&& rm -rf /var/lib/apt/lists/*
32+
zlib1g && \
33+
echo "**** clean up ****" && \
34+
rm -rf \
35+
/tmp/* \
36+
/var/lib/apt/lists/* \
37+
/var/tmp/*
4438

45-
COPY root /
46-
VOLUME [ "/config" ]
39+
# add local files
40+
COPY /root /
41+
42+
# ports and volumes
4743
EXPOSE 3389
48-
ENTRYPOINT ["/init"]
44+
VOLUME /config

0 commit comments

Comments
 (0)