Skip to content

Commit b546fff

Browse files
accettoaccetto
committed
Release 24.09
1 parent 371cf11 commit b546fff

File tree

8 files changed

+179
-115
lines changed

8 files changed

+179
-115
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66

77
***
88

9+
### Release 24.09
10+
11+
This is the first `G3v6` release.
12+
However, it's a maintenance release and the version number has been increased just to keep it synchronized with the **sibling project** [accetto/ubuntu-vnc-xfce-g3][accetto-github-ubuntu-vnc-xfce-g3].
13+
The previous version `G3v5` will still be available in this repository as the branch `archived-generation-g3v5`.
14+
15+
Changes:
16+
17+
- Default user `headless:headless (1000:1000)` has been changed to `headless:headless (1001:1001)`.
18+
- This change has been only done to keep the containers uniform with the ones from the sibling `Ubuntu` projects.
19+
- The directive `syntax=docker/dockerfile:experimental` has been removed from all Dockerfiles.
20+
- The `noVNC` starting page has been updated in all images.
21+
- If no `noVNC Client` is selected, then the `Full Client` will start automatically in 10 seconds.
22+
- The hook script `release_of` has been updated with the intention to report more helpful building errors.
23+
924
### Release 24.03.1
1025

1126
This is a fix release, correcting an unfortunate copy-and-paste error in the files `Dockerfile.xfce.nodejs`, `Dockerfile.xfce.nvm` and `Dockerfile.xfce.python`.

‎README.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Project `accetto/headless-coding-g3`
44

5-
Version: G3v5
5+
Version: G3v6
66

77
***
88

@@ -95,14 +95,18 @@ The **first generation** (G1) contains the GitHub repository [accetto/ubuntu-vnc
9595

9696
### Project versions
9797

98-
This file describes the **fifth version** (G3v5) of the project.
98+
This file describes the **sixth version** (G3v6) of the project.
99+
100+
However, also this version keeps evolving.
101+
Please check the [CHANGELOG][this-changelog] for more information about the changes.
102+
103+
The previous versions are still available in this **GitHub** repository as the branches named as `archived-generation-g3v{d}`.
99104

100105
*Remark*: The version number `G3v4` has been skipped, to align the numbering with the **sibling project** [accetto/ubuntu-vnc-xfce-g3][accetto-github-ubuntu-vnc-xfce-g3].
101106

102-
The **second version** (G3v2) and the **first version** (G3v1, or simply G3) will still be available in this GitHub repository as the branches `archived-generation-g3v2-ubuntu` and `archived-generation-g3v1`.
103-
The **third version** (G3v3) was not archived, because the changes are minor.
107+
The main purpose of the version `G3v6` is to keep the project and the images uniform with the ones from the sibling `Ubuntu` projects.
104108

105-
The version `G3v5` brings only one significant change comparing to the previous version `G3v3` and it also introduces the [portable Visual Studio Code][vscode-portable] installation.
109+
The version `G3v5` has brought only one significant change comparing to the previous version `G3v3` and it also introduces the [portable Visual Studio Code][vscode-portable] installation.
106110

107111
- The updated script `set_user_permissions.sh`, which is part of Dockerfiles, skips the hidden files and directories now.
108112
It generally should not have any unwanted side effects, but it may make a difference in some scenarios, hence the version increase.

‎docker/Dockerfile.xfce.nodejs‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG ARG_SUDO_INITIAL_PW=headless
1818
### stage_cache
1919
###############
2020

21-
FROM ${BASEIMAGE}:${BASETAG} as stage_cache
21+
FROM ${BASEIMAGE}:${BASETAG} AS stage_cache
2222

2323
### refresh the 'apt' cache
2424
RUN rm -f /etc/apt/apt.conf.d/docker-clean ; \
@@ -38,7 +38,7 @@ RUN \
3838
### stage_essentials
3939
####################
4040

41-
FROM ${BASEIMAGE}:${BASETAG} as stage_essentials
41+
FROM ${BASEIMAGE}:${BASETAG} AS stage_essentials
4242

4343
RUN \
4444
--mount=type=cache,from=stage_cache,sharing=locked,source=/var/cache/apt,target=/var/cache/apt \
@@ -59,7 +59,7 @@ RUN \
5959
### stage_xserver
6060
#################
6161

62-
FROM stage_essentials as stage_xserver
62+
FROM stage_essentials AS stage_xserver
6363
ARG ARG_APT_NO_RECOMMENDS
6464

6565
ENV \
@@ -81,7 +81,7 @@ RUN \
8181
### stage_xfce
8282
##############
8383

84-
FROM stage_xserver as stage_xfce
84+
FROM stage_xserver AS stage_xfce
8585
ARG ARG_APT_NO_RECOMMENDS
8686

8787
ENV FEATURES_BUILD_SLIM_XFCE="${ARG_APT_NO_RECOMMENDS:+1}"
@@ -98,7 +98,7 @@ RUN \
9898
### stage_tools
9999
###############
100100

101-
FROM stage_xfce as stage_tools
101+
FROM stage_xfce AS stage_tools
102102
ARG ARG_APT_NO_RECOMMENDS
103103
ARG ARG_FEATURES_SCREENSHOOTING
104104
ARG ARG_FEATURES_THUMBNAILING
@@ -124,7 +124,7 @@ RUN \
124124
### stage_vnc
125125
#############
126126

127-
FROM stage_tools as stage_vnc
127+
FROM stage_tools AS stage_vnc
128128
ARG ARG_VNC_COL_DEPTH
129129
ARG ARG_VNC_DISPLAY
130130
ARG ARG_VNC_PORT
@@ -165,7 +165,7 @@ EXPOSE "${VNC_PORT}"
165165
### stage_novnc
166166
###############
167167

168-
FROM stage_vnc as stage_novnc
168+
FROM stage_vnc AS stage_novnc
169169
ARG ARG_APT_NO_RECOMMENDS
170170
ARG ARG_NOVNC_PORT
171171
ARG ARG_NOVNC_VERSION
@@ -207,10 +207,12 @@ RUN echo \
207207
<head>\n\
208208
<title>noVNC</title>\n\
209209
<meta charset=\"utf-8\"/>\n\
210+
<meta http-equiv=\"refresh\" content=\"10; url='vnc.html'\" />\n\
210211
</head>\n\
211212
<body>\n\
212-
<p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
213-
<p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
213+
<p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
214+
<p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
215+
<p>Full Client will start automatically in 10 seconds...</p>\n\
214216
</body>\n\
215217
</html>" \
216218
> "${NOVNC_HOME}"/index.html
@@ -222,7 +224,7 @@ EXPOSE "${NOVNC_PORT}"
222224
### merge_stage_vnc
223225
###################
224226

225-
FROM ${ARG_MERGE_STAGE_VNC_BASE} as merge_stage_vnc
227+
FROM ${ARG_MERGE_STAGE_VNC_BASE} AS merge_stage_vnc
226228
ARG ARG_HEADLESS_USER_ID
227229
ARG ARG_HEADLESS_USER_NAME
228230
ARG ARG_HEADLESS_USER_GROUP_ID
@@ -245,7 +247,7 @@ COPY ./src/home "${HOME}"/
245247
### stage_chromium
246248
##################
247249

248-
FROM merge_stage_vnc as stage_chromium
250+
FROM merge_stage_vnc AS stage_chromium
249251
ARG ARG_APT_NO_RECOMMENDS
250252

251253
ENV \
@@ -266,7 +268,7 @@ COPY ./xfce-chromium/src/home/readme*.md "${HOME}"/
266268
### stage_firefox
267269
#################
268270

269-
FROM merge_stage_vnc as stage_firefox
271+
FROM merge_stage_vnc AS stage_firefox
270272
ARG ARG_APT_NO_RECOMMENDS
271273

272274
ENV \
@@ -286,7 +288,7 @@ COPY ./xfce-firefox/src/home/Desktop "${HOME}"/Desktop/
286288
### stage_firefox_plus
287289
### ##################
288290

289-
FROM stage_firefox as stage_firefox_plus
291+
FROM stage_firefox AS stage_firefox_plus
290292

291293
ENV FEATURES_FIREFOX_PLUS=1
292294

@@ -305,14 +307,14 @@ RUN \
305307
### merge_stage_browser
306308
#######################
307309

308-
FROM ${ARG_MERGE_STAGE_BROWSER_BASE} as merge_stage_browser
310+
FROM ${ARG_MERGE_STAGE_BROWSER_BASE} AS merge_stage_browser
309311

310312

311313
### ############
312314
### stage-nodejs
313315
### ############
314316

315-
FROM merge_stage_browser as stage_nodejs
317+
FROM merge_stage_browser AS stage_nodejs
316318
ARG ARG_APT_NO_RECOMMENDS
317319
ARG ARG_NODEJS_PORT
318320
ARG ARG_NODEJS_DISTRO
@@ -364,7 +366,7 @@ EXPOSE "${NODEJS_PORT}"
364366
### stage_vscode
365367
################
366368

367-
FROM stage_nodejs as stage_vscode
369+
FROM stage_nodejs AS stage_vscode
368370
ARG ARG_APT_NO_RECOMMENDS
369371
ARG ARG_VSCODE_DISTRO
370372
ARG ARG_VSCODE_VERSION
@@ -416,7 +418,7 @@ RUN \
416418
### FINAL STAGE
417419
###############
418420

419-
FROM ${ARG_FINAL_STAGE_BASE} as stage_final
421+
FROM ${ARG_FINAL_STAGE_BASE} AS stage_final
420422
ARG ARG_FEATURES_OVERRIDING_ENVV
421423
ARG ARG_SUDO_INITIAL_PW
422424

@@ -463,7 +465,7 @@ ENTRYPOINT [ "/usr/bin/tini", "--", "/dockerstartup/startup.sh" ]
463465
### METADATA STAGE
464466
##################
465467

466-
FROM stage_final as stage_metadata
468+
FROM stage_final AS stage_metadata
467469
ARG ARG_CREATED
468470
ARG ARG_DOCKER_TAG
469471
ARG ARG_VCS_REF

‎docker/Dockerfile.xfce.nvm‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG ARG_SUDO_INITIAL_PW=headless
1818
### stage_cache
1919
###############
2020

21-
FROM ${BASEIMAGE}:${BASETAG} as stage_cache
21+
FROM ${BASEIMAGE}:${BASETAG} AS stage_cache
2222

2323
### refresh the 'apt' cache
2424
RUN rm -f /etc/apt/apt.conf.d/docker-clean ; \
@@ -38,7 +38,7 @@ RUN \
3838
### stage_essentials
3939
####################
4040

41-
FROM ${BASEIMAGE}:${BASETAG} as stage_essentials
41+
FROM ${BASEIMAGE}:${BASETAG} AS stage_essentials
4242

4343
RUN \
4444
--mount=type=cache,from=stage_cache,sharing=locked,source=/var/cache/apt,target=/var/cache/apt \
@@ -59,7 +59,7 @@ RUN \
5959
### stage_xserver
6060
#################
6161

62-
FROM stage_essentials as stage_xserver
62+
FROM stage_essentials AS stage_xserver
6363
ARG ARG_APT_NO_RECOMMENDS
6464

6565
ENV \
@@ -81,7 +81,7 @@ RUN \
8181
### stage_xfce
8282
##############
8383

84-
FROM stage_xserver as stage_xfce
84+
FROM stage_xserver AS stage_xfce
8585
ARG ARG_APT_NO_RECOMMENDS
8686

8787
ENV FEATURES_BUILD_SLIM_XFCE="${ARG_APT_NO_RECOMMENDS:+1}"
@@ -98,7 +98,7 @@ RUN \
9898
### stage_tools
9999
###############
100100

101-
FROM stage_xfce as stage_tools
101+
FROM stage_xfce AS stage_tools
102102
ARG ARG_APT_NO_RECOMMENDS
103103
ARG ARG_FEATURES_SCREENSHOOTING
104104
ARG ARG_FEATURES_THUMBNAILING
@@ -127,7 +127,7 @@ RUN \
127127
### stage_vnc
128128
#############
129129

130-
FROM stage_tools as stage_vnc
130+
FROM stage_tools AS stage_vnc
131131
ARG ARG_VNC_COL_DEPTH
132132
ARG ARG_VNC_DISPLAY
133133
ARG ARG_VNC_PORT
@@ -168,7 +168,7 @@ EXPOSE "${VNC_PORT}"
168168
### stage_novnc
169169
###############
170170

171-
FROM stage_vnc as stage_novnc
171+
FROM stage_vnc AS stage_novnc
172172
ARG ARG_APT_NO_RECOMMENDS
173173
ARG ARG_NOVNC_PORT
174174
ARG ARG_NOVNC_VERSION
@@ -210,10 +210,12 @@ RUN echo \
210210
<head>\n\
211211
<title>noVNC</title>\n\
212212
<meta charset=\"utf-8\"/>\n\
213+
<meta http-equiv=\"refresh\" content=\"10; url='vnc.html'\" />\n\
213214
</head>\n\
214215
<body>\n\
215-
<p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
216-
<p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
216+
<p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
217+
<p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
218+
<p>Full Client will start automatically in 10 seconds...</p>\n\
217219
</body>\n\
218220
</html>" \
219221
> "${NOVNC_HOME}"/index.html
@@ -225,7 +227,7 @@ EXPOSE "${NOVNC_PORT}"
225227
### merge_stage_vnc
226228
###################
227229

228-
FROM ${ARG_MERGE_STAGE_VNC_BASE} as merge_stage_vnc
230+
FROM ${ARG_MERGE_STAGE_VNC_BASE} AS merge_stage_vnc
229231
ARG ARG_HEADLESS_USER_ID
230232
ARG ARG_HEADLESS_USER_NAME
231233
ARG ARG_HEADLESS_USER_GROUP_ID
@@ -248,7 +250,7 @@ COPY ./src/home "${HOME}"/
248250
### stage_chromium
249251
##################
250252

251-
FROM merge_stage_vnc as stage_chromium
253+
FROM merge_stage_vnc AS stage_chromium
252254
ARG ARG_APT_NO_RECOMMENDS
253255

254256
ENV \
@@ -269,7 +271,7 @@ COPY ./xfce-chromium/src/home/readme*.md "${HOME}"/
269271
### stage_firefox
270272
#################
271273

272-
FROM merge_stage_vnc as stage_firefox
274+
FROM merge_stage_vnc AS stage_firefox
273275
ARG ARG_APT_NO_RECOMMENDS
274276

275277
ENV \
@@ -289,7 +291,7 @@ COPY ./xfce-firefox/src/home/Desktop "${HOME}"/Desktop/
289291
### stage_firefox_plus
290292
### ##################
291293

292-
FROM stage_firefox as stage_firefox_plus
294+
FROM stage_firefox AS stage_firefox_plus
293295

294296
ENV FEATURES_FIREFOX_PLUS=1
295297

@@ -308,14 +310,14 @@ RUN \
308310
### merge_stage_browser
309311
#######################
310312

311-
FROM ${ARG_MERGE_STAGE_BROWSER_BASE} as merge_stage_browser
313+
FROM ${ARG_MERGE_STAGE_BROWSER_BASE} AS merge_stage_browser
312314

313315

314316
#############
315317
### stage_nvm
316318
#############
317319

318-
FROM merge_stage_browser as stage_nvm
320+
FROM merge_stage_browser AS stage_nvm
319321
ARG ARG_NVM_VERSION
320322
ARG ARG_NODEJS_PORT
321323

@@ -346,7 +348,7 @@ USER 0
346348
### stage_vscode
347349
################
348350

349-
FROM stage_nvm as stage_vscode
351+
FROM stage_nvm AS stage_vscode
350352
ARG ARG_APT_NO_RECOMMENDS
351353
ARG ARG_VSCODE_DISTRO
352354
ARG ARG_VSCODE_VERSION
@@ -398,7 +400,7 @@ RUN \
398400
### FINAL STAGE
399401
###############
400402

401-
FROM ${ARG_FINAL_STAGE_BASE} as stage_final
403+
FROM ${ARG_FINAL_STAGE_BASE} AS stage_final
402404
ARG ARG_FEATURES_OVERRIDING_ENVV
403405
ARG ARG_SUDO_INITIAL_PW
404406

@@ -445,7 +447,7 @@ ENTRYPOINT [ "/usr/bin/tini", "--", "/dockerstartup/startup.sh" ]
445447
### METADATA STAGE
446448
##################
447449

448-
FROM stage_final as stage_metadata
450+
FROM stage_final AS stage_metadata
449451
ARG ARG_CREATED
450452
ARG ARG_DOCKER_TAG
451453
ARG ARG_VCS_REF

0 commit comments

Comments
 (0)