Skip to content
This repository has been archived by the owner on Mar 21, 2021. It is now read-only.

Commit

Permalink
release 19.07.3
Browse files Browse the repository at this point in the history
  • Loading branch information
accetto committed Jul 21, 2019
1 parent b0f094a commit 673c7b7
Show file tree
Hide file tree
Showing 20 changed files with 207 additions and 206 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
- **npm** version **6.9.0** (comes with node)
- **xubuntu-vnc-firefox**
- still kept on version **67.0.4** because also **68.0.1** crashes a lot (Gah. Your tab just crashed.)
- **xubuntu-vnc-javascript**
- folder renamed to **xubuntu-vnc-typescript**
- Dockerfile redesigned
- **curl** and **git** removed (they are inherited from the base now)
- newer **Node.js** and **npm** (inherited from the base)
- **xubuntu-vnc-javascript-heroku**
- based on the renamed **xubuntu-vnc-typescript** now
- newer **Node.js** and **npm** (inherited from the base)

### Release 19.07.2

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ Contains resources for building [accetto/xubuntu-vnc-chromium][this-docker-xubun

Contains resources for building [accetto/xubuntu-vnc-node][this-docker-xubuntu-vnc-node] images with JavaScript-based development platform. It adds [Node.js][nodejs] platform, [npm][npm] package manager and distributed version control system [Git][git]. Additional [Node.js][nodejs] modules can be easily added using [npm][npm].

#### [xubuntu-vnc-javascript][this-github-xubuntu-vnc-javascript]
#### [xubuntu-vnc-typescript][this-github-xubuntu-vnc-typescript]

Contains resources for building [accetto/xubuntu-vnc-javascript][this-docker-xubuntu-vnc-javascript] images with JavaScript-based development platform. It adds [Visual Studio Code][vscode] developer editor and [TypeScript][typescript] programming language.
Contains resources for building [accetto/xubuntu-vnc-typescript][this-docker-xubuntu-vnc-typescript] images with JavaScript-based development platform. It adds [Visual Studio Code][vscode] developer editor and [TypeScript][typescript] programming language. Additional [Node.js][nodejs] modules can be easily added using [npm][npm].

#### [xubuntu-vnc-heroku][this-github-xubuntu-vnc-heroku]

Contains resources for building [accetto/xubuntu-vnc-js-heroku-postgresql][this-docker-xubuntu-vnc-js-heroku-postgresql] images with [heroku/CLI][heroku-cli] and [PostgreSQL][postgresql].
Contains resources for building [accetto/xubuntu-vnc-js-heroku-postgresql][this-docker-xubuntu-vnc-js-heroku-postgresql] images with [heroku/CLI][heroku-cli] and [PostgreSQL][postgresql] for JavaScript-based development with [Node.js][nodejs], [npm][npm], [Git][git], [Visual Studio Code][vscode] and [TypeScript][typescript]. Additional [Node.js][nodejs] modules can be easily added using [npm][npm].

#### [utils][this-github-utils]

Expand Down Expand Up @@ -105,8 +105,8 @@ Credit goes to all the countless people and companies, who contribute to open so
[this-github-xubuntu-vnc-node]: https://github.com/accetto/xubuntu-vnc/tree/master/docker/xubuntu-vnc-node/
[this-docker-xubuntu-vnc-node]: https://hub.docker.com/r/accetto/xubuntu-vnc-node/

[this-github-xubuntu-vnc-javascript]: https://github.com/accetto/xubuntu-vnc/tree/master/docker/xubuntu-vnc-javascript/
[this-docker-xubuntu-vnc-javascript]: https://hub.docker.com/r/accetto/xubuntu-vnc-javascript/
[this-github-xubuntu-vnc-typescript]: https://github.com/accetto/xubuntu-vnc/tree/master/docker/xubuntu-vnc-typescript/
[this-docker-xubuntu-vnc-typescript]: https://hub.docker.com/r/accetto/xubuntu-vnc-typescript/

[this-github-xubuntu-vnc-heroku]: https://github.com/accetto/xubuntu-vnc/tree/master/docker/xubuntu-vnc-heroku/
[this-docker-xubuntu-vnc-js-heroku-postgresql]: https://hub.docker.com/r/accetto/xubuntu-vnc-js-heroku-postgresql
Expand Down
20 changes: 12 additions & 8 deletions docker/xubuntu-vnc-heroku/Dockerfile.js.heroku
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# docker build -f Dockerfile.js.heroku -t accetto/xubuntu-vnc-javascript-heroku .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=firefox -t accetto/xubuntu-vnc-javascript-heroku:firefox .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=chromium -t accetto/xubuntu-vnc-javascript-heroku:chromium .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=lab -t accetto/xubuntu-vnc-javascript-heroku:lab .
# docker build -f Dockerfile.js.heroku -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql .
# docker build -f Dockerfile.js.heroku -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:dfw .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=firefox -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:firefox .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=chromium -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:chromium .
# docker build -f Dockerfile.js.heroku --build-arg BASETAG=lab -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:lab .

ARG BASETAG=latest

FROM accetto/xubuntu-vnc-javascript:${BASETAG} as stage-heroku
FROM accetto/xubuntu-vnc-typescript:${BASETAG} as stage-heroku

USER 0

Expand All @@ -25,13 +26,16 @@ RUN apt-get update && apt-get install -y \
# RUN \
# wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \
# && echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list \
# && apt-get update \
# && apt-get install -y postgresql-10 \
# && apt-get update && apt-get install -y \
# postgresql-10 \
# && apt-get -y autoremove \
# && rm -rf /var/lib/apt/lists/

### Fix permissions
RUN /dockerstartup/set_user_permissions.sh ${HOME}

FROM stage-postgresql as stage-final

ENV REFRESHED_AT 2019-07-13
ENV REFRESHED_AT 2019-07-21

USER 1001
13 changes: 8 additions & 5 deletions docker/xubuntu-vnc-heroku/Dockerfile.js.heroku.chromium
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# docker build -f Dockerfile.js.heroku.chromium -t accetto/xubuntu-vnc-javascript-heroku:chromium .
# docker build -f Dockerfile.js.heroku.chromium -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:chromium .

ARG BASETAG=chromium

FROM accetto/xubuntu-vnc-javascript:${BASETAG} as stage-heroku
FROM accetto/xubuntu-vnc-typescript:${BASETAG} as stage-heroku

USER 0

Expand All @@ -22,13 +22,16 @@ RUN apt-get update && apt-get install -y \
# RUN \
# wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \
# && echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list \
# && apt-get update \
# && apt-get install -y postgresql-10 \
# && apt-get update && apt-get install -y \
# postgresql-10 \
# && apt-get -y autoremove \
# && rm -rf /var/lib/apt/lists/

### Fix permissions
RUN /dockerstartup/set_user_permissions.sh ${HOME}

FROM stage-postgresql as stage-final

ENV REFRESHED_AT 2019-07-13
ENV REFRESHED_AT 2019-07-21

USER 1001
13 changes: 8 additions & 5 deletions docker/xubuntu-vnc-heroku/Dockerfile.js.heroku.firefox
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# docker build -f Dockerfile.js.heroku.firefox -t accetto/xubuntu-vnc-javascript-heroku:firefox .
# docker build -f Dockerfile.js.heroku.firefox -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:firefox .

ARG BASETAG=firefox

FROM accetto/xubuntu-vnc-javascript:${BASETAG} as stage-heroku
FROM accetto/xubuntu-vnc-typescript:${BASETAG} as stage-heroku

USER 0

Expand All @@ -22,13 +22,16 @@ RUN apt-get update && apt-get install -y \
# RUN \
# wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \
# && echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list \
# && apt-get update \
# && apt-get install -y postgresql-10 \
# && apt-get update && apt-get install -y \
# postgresql-10 \
# && apt-get -y autoremove \
# && rm -rf /var/lib/apt/lists/

### Fix permissions
RUN /dockerstartup/set_user_permissions.sh ${HOME}

FROM stage-postgresql as stage-final

ENV REFRESHED_AT 2019-07-13
ENV REFRESHED_AT 2019-07-21

USER 1001
20 changes: 11 additions & 9 deletions docker/xubuntu-vnc-heroku/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc] server for headless use, JavaScript development platform, [Heroku-CLI][heroku-cli] toolkit and [PostgreSQL][postgresql] database.

The images are based on the base image [accetto/xubuntu-vnc-javascript][accetto-docker-xubuntu-vnc-javascript] and inherit all the components and features. Therefore not the whole description will be repeated here. The base image tags `*:firefox` and `*:chromium` are also reflected.
The images are based on the base image [accetto/xubuntu-vnc-typescript][accetto-docker-xubuntu-vnc-typescript] and inherit all the components and features. Therefore not the whole description will be repeated here. The base image tags `*:firefox` and `*:chromium` are also reflected.

This image inherits the components

Expand All @@ -17,6 +17,7 @@ This image inherits the components
- [curl][curl] utility
- [Git][git] distributed version control system
- [Visual Studio Code][vscode] developer editor
- [TypeScript][typescript] programming language

and adds the following ones:

Expand All @@ -33,15 +34,15 @@ The history of notable changes is documented in the [CHANGELOG][this-changelog].

The following image tags are regularly maintained and rebuilt:

- `latest` is based on `accetto/xubuntu-vnc-javascript:latest`
- `latest` is based on `accetto/xubuntu-vnc-typescript:latest`

[![version badge](https://images.microbadger.com/badges/version/accetto/xubuntu-vnc-js-heroku-postgresql:latest.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:latest "Get your own version badge on microbadger.com") [![size badge](https://images.microbadger.com/badges/image/accetto/xubuntu-vnc-js-heroku-postgresql:latest.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:latest "Get your own image badge on microbadger.com")

- `firefox` is based on `accetto/xubuntu-vnc-javascript:firefox` and includes also [Firefox][firefox] web browser
- `firefox` is based on `accetto/xubuntu-vnc-typescript:firefox` and includes also [Firefox][firefox] web browser

[![version badge](https://images.microbadger.com/badges/version/accetto/xubuntu-vnc-js-heroku-postgresql:firefox.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:firefox "Get your own version badge on microbadger.com") [![size badge](https://images.microbadger.com/badges/image/accetto/xubuntu-vnc-js-heroku-postgresql:firefox.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:firefox "Get your own image badge on microbadger.com")

- `chromium` is based on `accetto/xubuntu-vnc-javascript:chromium` and includes also [Chromium][chromium] web browser
- `chromium` is based on `accetto/xubuntu-vnc-typescript:chromium` and includes also [Chromium][chromium] web browser

[![version badge](https://images.microbadger.com/badges/version/accetto/xubuntu-vnc-js-heroku-postgresql:chromium.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:chromium "Get your own version badge on microbadger.com") [![size badge](https://images.microbadger.com/badges/image/accetto/xubuntu-vnc-js-heroku-postgresql:chromium.svg)](https://microbadger.com/images/accetto/xubuntu-vnc-js-heroku-postgresql:chromium "Get your own image badge on microbadger.com")

Expand All @@ -51,17 +52,17 @@ The [Git Hub][this-github-xubuntu-vnc-heroku] repository contains several Docker

- `Dockerfile.js.heroku`

This is the main Dockerfile for building the `latest` image tag based on the `accetto/xubuntu-vnc-javascript:latest` tag by default.
This is the main Dockerfile for building the `latest` image tag based on the `accetto/xubuntu-vnc-typescript:latest` tag by default.

However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc-javascript:lab`.
However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc-typescript:lab`.

- `Dockerfile.js.heroku.firefox`

This Dockerfile is for building the `firefox` image tag, which is based on the `accetto/xubuntu-vnc-javascript:firefox` tag and therefore includes also [Firefox][firefox] web browser and the **plus** features
This Dockerfile is for building the `firefox` image tag, which is based on the `accetto/xubuntu-vnc-typescript:firefox` tag and therefore includes also [Firefox][firefox] web browser and the **plus** features

- `Dockerfile.js.heroku.chromium`

This Dockerfile is for building the `chromium` image tag, which is based on the `accetto/xubuntu-vnc-javascript:chromium` tag and therefore includes also [Chromium][chromium] web browser
This Dockerfile is for building the `chromium` image tag, which is based on the `accetto/xubuntu-vnc-typescript:chromium` tag and therefore includes also [Chromium][chromium] web browser

### Ports

Expand Down Expand Up @@ -122,7 +123,7 @@ Credit goes to all the countless people and companies, who contribute to open so

[this-screenshot-container]: https://raw.githubusercontent.com/accetto/xubuntu-vnc/master/docker/xubuntu-vnc-heroku/xubuntu-vnc-heroku.jpg

[accetto-docker-xubuntu-vnc-javascript]: https://hub.docker.com/r/accetto/xubuntu-vnc-javascript
[accetto-docker-xubuntu-vnc-typescript]: https://hub.docker.com/r/accetto/xubuntu-vnc-typescript

[docker-doc]: https://docs.docker.com/
[docker-doc-managing-data]: https://docs.docker.com/storage/
Expand All @@ -141,4 +142,5 @@ Credit goes to all the countless people and companies, who contribute to open so
[nodejs]: https://nodejs.org/en/
[npm]: https://www.npmjs.com/
[postgresql]: https://www.postgresql.org/
[typescript]: https://www.typescriptlang.org/
[vscode]: https://code.visualstudio.com/
55 changes: 0 additions & 55 deletions docker/xubuntu-vnc-javascript/Dockerfile.javascript

This file was deleted.

51 changes: 0 additions & 51 deletions docker/xubuntu-vnc-javascript/Dockerfile.javascript.chromium

This file was deleted.

51 changes: 0 additions & 51 deletions docker/xubuntu-vnc-javascript/Dockerfile.javascript.firefox

This file was deleted.

3 changes: 2 additions & 1 deletion docker/xubuntu-vnc-node/Dockerfile.node
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ RUN \
mkdir -p \
${NPM_CONFIG_PREFIX} \
${NODE_PATH} \
${HOME}/.npm \
&& chmod g+w \
${NPM_CONFIG_PREFIX} \
/usr/local/lib \
Expand All @@ -58,6 +59,6 @@ RUN chmod g+w /usr/src

WORKDIR /usr/src

ENV REFRESHED_AT 2019-07-20
ENV REFRESHED_AT 2019-07-21

USER 1001
Loading

0 comments on commit 673c7b7

Please sign in to comment.