From db7ba49d2c01bc2c7aa228d4a91c04be9cfb1f6d Mon Sep 17 00:00:00 2001 From: Flavio Barisi Date: Thu, 13 Aug 2020 11:35:14 +0200 Subject: [PATCH 1/5] Flutter plugin --- .travis.yml | 15 +++++---------- Dockerfile | 2 ++ Dockerfile.complex | 21 --------------------- root/etc/cont-init.d/98-flutter | 15 +++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 --------------------------- root/etc/services.d/sshvpn/run | 3 --- 6 files changed, 22 insertions(+), 61 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-flutter delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.travis.yml b/.travis.yml index e6e5b1f..ca47866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,24 +4,19 @@ language: shell branches: only: - - - #replace variables, omit brackets + - code-server-flutter services: - docker env: global: - - DOCKERHUB="linuxserver/mods" #don't modify - - BASEIMAGE="baseimagename" #replace - - MODNAME="modname" #replace + - DOCKERHUB="flavio20002/mods" + - BASEIMAGE="code-server" + - MODNAME="python3" jobs: include: - - stage: PR-BuildImage - if: (type IN (pull_request)) - script: - # Build image - - docker build --no-cache -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} . - stage: BuildImage if: (NOT (type IN (pull_request))) script: @@ -32,4 +27,4 @@ jobs: - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin # Push all of the tags - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} - - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} \ No newline at end of file + - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} diff --git a/Dockerfile b/Dockerfile index 2f24b20..42de87d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM scratch +LABEL maintainer="flavio20002" + # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index 4463d83..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,21 +0,0 @@ -## Buildstage ## -FROM lsiobase/alpine:3.9 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb" - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/root/etc/cont-init.d/98-flutter b/root/etc/cont-init.d/98-flutter new file mode 100644 index 0000000..46cf6dd --- /dev/null +++ b/root/etc/cont-init.d/98-flutter @@ -0,0 +1,15 @@ +#!/usr/bin/with-contenv bash + +ARCH=$(uname -m) + +if [ ! -f "/flutter/bin/flutter" ]; then + echo "Installing Flutter" + apt-get update + apt-get install -y \ + unzip + git clone https://github.com/flutter/flutter.git -b beta --depth 1 /flutter + ln -s /flutter/bin/flutter /usr/bin/flutter + flutter doctor +else + echo "PowerShell already installed, skipping" +fi \ No newline at end of file diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get update - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16 From 16782fd1a280fadd3876d856bd7c3c1e5b4312a7 Mon Sep 17 00:00:00 2001 From: Flavio Barisi Date: Thu, 13 Aug 2020 11:36:58 +0200 Subject: [PATCH 2/5] Fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca47866..a7bcd1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: global: - DOCKERHUB="flavio20002/mods" - BASEIMAGE="code-server" - - MODNAME="python3" + - MODNAME="flutter" jobs: include: From fdf98c23b22df0d203888c3ef6de51514c3e447f Mon Sep 17 00:00:00 2001 From: Flavio Barisi Date: Thu, 13 Aug 2020 12:00:29 +0200 Subject: [PATCH 3/5] Fix --- README.md | 28 ++++++++++++++++------------ root/etc/cont-init.d/98-flutter | 3 ++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2418e53..967ef3a 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ -# Rsync - Docker mod for openssh-server +# Flutter Beta - Docker mod for code-server -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds a Flutter beta dev environment to code-server, to be installed/updated during container start. The enviornment is already configured to run browser apps. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +``` +flutter create myapp +cd myapp +flutter run --web-port=8989 +``` -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2` +Open a browser pointing to: -# Mod creation instructions +``` +https://my-code-server-host/proxy/8989 +``` -* Ask the team to create a new branch named `-`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch. -* Fork the repo, checkout the newly created branch. -* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done. -* Inspect the `root` folder contents. Edit, add and remove as necessary. -* Edit this readme with pertinent info, delete these instructions. -* Finally edit the `travis.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`. -* Submit PR against the branch created by the team. \ No newline at end of file +When edit the code, press r and refresh the web page, or install the Flutter extension for code-server. + +In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-flutter` + +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-flutter|linuxserver/mods:code-server-mod2` \ No newline at end of file diff --git a/root/etc/cont-init.d/98-flutter b/root/etc/cont-init.d/98-flutter index 46cf6dd..e6da814 100644 --- a/root/etc/cont-init.d/98-flutter +++ b/root/etc/cont-init.d/98-flutter @@ -10,6 +10,7 @@ if [ ! -f "/flutter/bin/flutter" ]; then git clone https://github.com/flutter/flutter.git -b beta --depth 1 /flutter ln -s /flutter/bin/flutter /usr/bin/flutter flutter doctor + flutter config --enable-web else - echo "PowerShell already installed, skipping" + echo "Flutter already installed, skipping" fi \ No newline at end of file From a1def6ce21c972a2ec16131b06d61204fcc37c61 Mon Sep 17 00:00:00 2001 From: Flavio Barisi Date: Thu, 13 Aug 2020 20:13:52 +0200 Subject: [PATCH 4/5] Disable analytics --- root/etc/cont-init.d/98-flutter | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/cont-init.d/98-flutter b/root/etc/cont-init.d/98-flutter index e6da814..0568c82 100644 --- a/root/etc/cont-init.d/98-flutter +++ b/root/etc/cont-init.d/98-flutter @@ -11,6 +11,7 @@ if [ ! -f "/flutter/bin/flutter" ]; then ln -s /flutter/bin/flutter /usr/bin/flutter flutter doctor flutter config --enable-web + flutter config --no-analytics else echo "Flutter already installed, skipping" fi \ No newline at end of file From 27012ad81c1c9c51607fe77ad1f2301ea160a693 Mon Sep 17 00:00:00 2001 From: Flavio Barisi Date: Fri, 14 Aug 2020 12:12:56 +0200 Subject: [PATCH 5/5] Fix --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7bcd1a..1b18b4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,17 @@ services: env: global: - - DOCKERHUB="flavio20002/mods" + - DOCKERHUB="linuxserver/mods" - BASEIMAGE="code-server" - MODNAME="flutter" jobs: include: + - stage: PR-BuildImage + if: (type IN (pull_request)) + script: + # Build image + - docker build --no-cache -t ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} . - stage: BuildImage if: (NOT (type IN (pull_request))) script: @@ -27,4 +32,4 @@ jobs: - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin # Push all of the tags - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} - - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} + - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} \ No newline at end of file