Skip to content

Commit 095d9bb

Browse files
author
Simon Hofmann
committed
Merge branch 'dev'
2 parents 45777cb + 35bfb52 commit 095d9bb

17 files changed

Lines changed: 107 additions & 56 deletions

‎.build/env_dockerhub.sh‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.build/trigger_dockerhub.sh‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
#!/usr/bin/env bash
22
set -e -o pipefail
33

4+
5+
if [ -z $GIT_BRANCH ] ; then
6+
GIT_BRANCH=$TRAVIS_BRANCH
7+
fi
8+
if [ -z $GIT_BRANCH ] ; then
9+
echo "cloud not execute script! Please specify at least on environment variable of: GIT_BRANCH, TRAVIS_BRANCH"
10+
exit -1
11+
fi
12+
13+
echo "branch=$GIT_BRANCH"
14+
GIT_BRANCH=${GIT_BRANCH/origin\/}
15+
DOCKER_TAG="${GIT_BRANCH/refs\/tags\/}"
16+
17+
if [[ $DOCKER_TAG == "master" ]] ; then
18+
echo "skip building latest tag!"
19+
echo "... use 'tag_image.sh' script to release a new version. See: https://github.com/ConSol/docker-headless-vnc-container/blob/master/how-to-release.md"
20+
exit 0
21+
fi
22+
23+
echo "DOCKER_TAG=$DOCKER_TAG"
24+
echo "..."
425
echo "trigger dockerhub builds for Tag $DOCKER_TAG:"
526

627
URLS=(
@@ -11,20 +32,21 @@ URLS=(
1132
)
1233
PAYLOAD='{"source_type": "Tag", "source_name": "'$DOCKER_TAG'"}'
1334

14-
if [[ $DOCKER_TAG == "latest" ]] ; then
15-
echo "DockerHub will not be triggered: use script 'tag_image.sh'"
16-
#PAYLOAD='{"docker_tag": "'latest'"}'
17-
exit 0
18-
fi
35+
# use docker tag instead of branch
1936
if [[ $DOCKER_TAG == "dev" ]] ; then
2037
PAYLOAD='{"docker_tag": "'dev'"}'
2138
fi
2239

40+
# use first parameter to filter trigger command
41+
IMAGENAME=$1
42+
2343
#Loop
2444
for URL in "${URLS[@]}"
2545
do
26-
echo "URL: $URL"
27-
echo "PAYLOAD: $PAYLOAD"
28-
curl -H "Content-Type: application/json" --data "$PAYLOAD" -X POST "$URL"
29-
echo " - done!"
46+
if [ -z $IMAGENAME ] || [[ $URL =~ .*"$IMAGENAME".* ]] ; then
47+
echo "URL: $URL"
48+
echo "PAYLOAD: $PAYLOAD"
49+
curl -H "Content-Type: application/json" --data "$PAYLOAD" -X POST "$URL"
50+
echo " - done!"
51+
fi
3052
done

‎.travis.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ services:
66
language: generic
77

88
env:
9-
- DISTRI=centos DESKTOP=Xfce4
10-
- DISTRI=centos DESKTOP=IceWM
11-
- DISTRI=ubuntu DESKTOP=Xfce4
12-
- DISTRI=ubuntu DESKTOP=IceWM
9+
- DISTRI=ubuntu DESKTOP=xfce
10+
- DISTRI=ubuntu DESKTOP=icewm
11+
- DISTRI=centos DESKTOP=xfce
12+
- DISTRI=centos DESKTOP=icewm
1313

1414
script:
15-
- 'if [ ${DISTRI} == "centos" ] && [ ${DESKTOP} == "Xfce4" ]; then
16-
docker build -t centos-xfce-vnc -f ./Dockerfile.centos.xfce.vnc . ;
17-
elif [ ${DISTRI} == "centos" ] && [ ${DESKTOP} == "IceWM" ]; then
18-
docker build -t centos-icewm-vnc -f ./Dockerfile.centos.icewm.vnc . ;
19-
elif [ ${DISTRI} == "ubuntu" ] && [ ${DESKTOP} == "Xfce4" ]; then
20-
docker build -t ubuntu-xfce-vnc -f ./Dockerfile.ubuntu.xfce.vnc . ;
21-
else
22-
docker build -t ubuntu-icewm-vnc -f ./Dockerfile.ubuntu.icewm.vnc . ;
23-
fi'
24-
15+
- docker build -t local/${DISTRI}-${DESKTOP}-vnc -f ./Dockerfile.${DISTRI}.${DESKTOP}.vnc .
16+
after_success:
17+
- bash .build/trigger_dockerhub.sh ${DISTRI}-${DESKTOP}-vnc
18+
19+
## use standard notification to committer
20+
#notifications:
21+
# recipients:
22+
# - "testautomatisierung@consol.de"
23+
# on_success: change # default: change
24+
# on_failure: always # default: always

‎Dockerfile.centos.icewm.vnc‎

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

33
FROM centos:7
44

5-
MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
6-
ENV REFRESHED_AT 2018-03-27
5+
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6+
ENV REFRESHED_AT 2018-10-29
77

88
LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Centos" \

‎Dockerfile.centos.xfce.vnc‎

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

33
FROM centos:7
44

5-
MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
6-
ENV REFRESHED_AT 2018-03-27
5+
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6+
ENV REFRESHED_AT 2018-10-29
77

88
LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Centos" \

‎Dockerfile.ubuntu.icewm.vnc‎

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

33
FROM ubuntu:16.04
44

5-
MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
6-
ENV REFRESHED_AT 2018-03-27
5+
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6+
ENV REFRESHED_AT 2018-10-29
77

88
LABEL io.k8s.description="Headless VNC Container with IceWM window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Ubuntu" \
@@ -41,6 +41,9 @@ RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} +
4141
RUN $INST_SCRIPTS/tools.sh
4242
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
4343

44+
### Install custom fonts
45+
RUN $INST_SCRIPTS/install_custom_fonts.sh
46+
4447
### Install xvnc-server & noVNC - HTML5 based VNC viewer
4548
RUN $INST_SCRIPTS/tigervnc.sh
4649
RUN $INST_SCRIPTS/no_vnc.sh

‎Dockerfile.ubuntu.xfce.vnc‎

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

33
FROM ubuntu:16.04
44

5-
MAINTAINER Tobias Schneck "tobias.schneck@consol.de"
6-
ENV REFRESHED_AT 2018-03-27
5+
MAINTAINER Simon Hofmann "simon.hofmann@consol.de"
6+
ENV REFRESHED_AT 2018-10-29
77

88
LABEL io.k8s.description="Headless VNC Container with Xfce window manager, firefox and chromium" \
99
io.k8s.display-name="Headless VNC Container based on Ubuntu" \
@@ -41,6 +41,9 @@ RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} +
4141
RUN $INST_SCRIPTS/tools.sh
4242
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
4343

44+
### Install custom fonts
45+
RUN $INST_SCRIPTS/install_custom_fonts.sh
46+
4447
### Install xvnc-server & noVNC - HTML5 based VNC viewer
4548
RUN $INST_SCRIPTS/tigervnc.sh
4649
RUN $INST_SCRIPTS/no_vnc.sh

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ If you open some graphic/work intensive websites in the Docker container (especi
138138

139139
Thx @raghavkarol for the hint!
140140

141+
## How to release
142+
See **[how-to-release.md](./how-to-release.md)**
143+
141144
## Contributors
142145

143146
At this point we want to thank all contributors, which helped to move this great project by submitting code, writing documentation, or adapting other tools to play well together with the docker headless container.

‎changelog.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
## Changelog of the Docker headless VNC images
22

3+
### Version 1.4.0:
4+
* added Github issue and pull request templates
5+
* added install script for custom fonts ([#83](https://github.com/ConSol/docker-headless-vnc-container/issues/83)))
6+
* fixed problem that VNC password was not properly set after doing a Docker commit ([#88](https://github.com/ConSol/docker-headless-vnc-container/issues/88))
7+
* fixed some typos ([#87](https://github.com/ConSol/docker-headless-vnc-container/issues/87))
8+
* added 'how-to-release' info ([#75](https://github.com/ConSol/docker-headless-vnc-container/issues/75))
9+
* added Travis build ([#74](https://github.com/ConSol/docker-headless-vnc-container/issues/74))
10+
311
### Version 1.3.0:
412
* change default USER to `1000` ([#61](https://github.com/ConSol/docker-headless-vnc-container/issues/61))
513
* refactor vnc startup script ([#73](https://github.com/ConSol/docker-headless-vnc-container/issues/73))

‎how-to-release.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# How to release
2+
3+
* Check if `changelog.md` is correct
4+
* Check if all features are merged in dev and pushed
5+
* Pull the latest `dev` images
6+
7+
.build/tag_image.sh dev 1.x.x --save
8+
9+
* Test if the latest `dev` build is usable
10+
* Change the the `FROM` statement in Sakuli `Dockerfile` to `dev` tag (in separate branch) and run (after build on dockerhub) [`docker/.build/tag_image.sh --save`](https://github.com/ConSol/sakuli/blob/master/docker/.build/tag_image.sh)
11+
12+
* On success - push the tested `dev` images to dockerhub
13+
14+
.build/tag_image.sh dev 1.x.x
15+
.build/tag_image.sh dev latest
16+
17+
* Merge `dev` branch to `master`
18+
19+
* Create a release on [github.com/ConSol/docker-headless-vnc-container/releases/new](https://github.com/ConSol/docker-headless-vnc-container/releases/new)
20+
* Write a blog post for [labs.consol.de](https://labs.consol.de/)

0 commit comments

Comments
 (0)