From 26dd9001fa5a669b6f469665be6b7c1c61821dd3 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 16:26:12 +0000
Subject: [PATCH 1/7] fixed typo, added bash to package list

---
 01ubuntu.sh | 1 +
 Dockerfile  | 7 +++----
 Makefile    | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/01ubuntu.sh b/01ubuntu.sh
index d1d715b..efa54a4 100644
--- a/01ubuntu.sh
+++ b/01ubuntu.sh
@@ -18,6 +18,7 @@ apt update && apt upgrade -y
 PKGS="
     apt-file
     apt-utils
+    bash
     bash-completion
     build-essential
     byobu
diff --git a/Dockerfile b/Dockerfile
index 7d3b95e..51ee327 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ RUN dpkg -i /tmp/atom.deb && rm /tmp/atom.deb
 ########################################################
 RUN git clone https://github.com/creationix/nvm.git /usr/local/nvm
 ADD ./nvmsetup.sh /etc/profile.d/nvmsetup.sh
-RUN \ bash -c 'source /etc/profile.d/nvmsetup.sh && \
+RUN bash -c 'source /etc/profile.d/nvmsetup.sh && \
     nvm install --lts && \
     nvm use default'
 
@@ -43,11 +43,10 @@ RUN \ bash -c 'source /etc/profile.d/nvmsetup.sh && \
 #####  javascript, my favorite
 ########################################################
 # yes i know yarn says not to install it this way
-RUN \
-    source /etc/profile.d/nvmsetup.sh && \
+RUN bash -c 'source /etc/profile.d/nvmsetup.sh && \
     nvm use default && \
     npm install -g npm && \
-    npm install -g yarn
+    npm install -g yarn'
 
 RUN yarn global add prettier
 RUN yarn global add create-react-app
diff --git a/Makefile b/Makefile
index 0b653c6..40c953b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 REMOTEHOST := root@las2.bounce
 IMAGENAME := sneak/dockerized-workstation
+YYYYMMDD := $(shell date +%Y%m%d)
 
 default: remote-build
 
 build:
-	docker build -t $(IMAGENAME) .
+	docker build -t $(IMAGENAME):$(YYYYMMDD) .
 
 upload:
 	rsync -avP --delete ./ $(REMOTEHOST):dockerized-workstation/
@@ -12,5 +13,8 @@ upload:
 remote-build: upload
 	ssh -t $(REMOTEHOST) "cd dockerized-workstation && make build"
 
+publish:
+	ssh -t $(REMOTEHOST) "cd dockerized-workstation && docker push $(IMAGENAME):$(YYYYMMDD)"
+
 tryout:
 	ssh -t $(REMOTEHOST) "docker run -ti $(IMAGENAME)"

From 3685f5be174626f536d496b10270bc8e5ec5db04 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 17:24:59 +0000
Subject: [PATCH 2/7] seems to build now

---
 Dockerfile  | 20 +++-----------------
 nvm-init.sh | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 nvm-init.sh

diff --git a/Dockerfile b/Dockerfile
index 51ee327..84b0d19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,23 +31,9 @@ ADD https://atom.io/download/deb /tmp/atom.deb
 RUN dpkg -i /tmp/atom.deb && rm /tmp/atom.deb
 
 ########################################################
-#####  nvm
+#####  nvm and node and yarn and js packages
 ########################################################
 RUN git clone https://github.com/creationix/nvm.git /usr/local/nvm
 ADD ./nvmsetup.sh /etc/profile.d/nvmsetup.sh
-RUN bash -c 'source /etc/profile.d/nvmsetup.sh && \
-    nvm install --lts && \
-    nvm use default'
-
-########################################################
-#####  javascript, my favorite
-########################################################
-# yes i know yarn says not to install it this way
-RUN bash -c 'source /etc/profile.d/nvmsetup.sh && \
-    nvm use default && \
-    npm install -g npm && \
-    npm install -g yarn'
-
-RUN yarn global add prettier
-RUN yarn global add create-react-app
-RUN yarn global add jetpack
+ADD ./nvm-init.sh /tmp/nvm-init.sh
+RUN bash /tmp/nvm-init.sh && rm /tmp/nvm-init.sh
diff --git a/nvm-init.sh b/nvm-init.sh
new file mode 100644
index 0000000..e12e73c
--- /dev/null
+++ b/nvm-init.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+source /etc/profile.d/nvmsetup.sh
+nvm install --lts
+nvm use default
+
+# yes i know yarn says not to install it this way
+npm install -g npm
+npm install -g yarn
+
+#YARN="/usr/local/nvm/versions/node/v*/bin/yarn"
+
+export PATH="$PATH:/usr/local/nvm/versions/node/v*/bin"
+
+NPM_PKGS="
+    create-react-app
+    jetpack
+    now
+    prettier
+"
+
+for PKG in $NPM_PKGS ; do
+    yarn global add $PKG
+done

From 7eb350a9561ffab038c937d125e1889936fd0f31 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 17:25:07 +0000
Subject: [PATCH 3/7] first version of entry script

---
 contrib/enter | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 contrib/enter

diff --git a/contrib/enter b/contrib/enter
new file mode 100755
index 0000000..aa9ae23
--- /dev/null
+++ b/contrib/enter
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run -ti sneak/dockerized-workstation /bin/bash

From bcc087a1fc43299b3360d1e2afc33132ed91e3d4 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 18:56:03 +0000
Subject: [PATCH 4/7] debugging docker push from ci

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07fe1c3..7470e68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build:
   stage: build
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - echo docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
 

From 1fe95d87fb61d1f3b0e86d4ce09335d4b51b1da7 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 18:57:04 +0000
Subject: [PATCH 5/7] try pushing with hardcoded name/tag

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7470e68..1babdf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ build:
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - echo docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - docker push sneak/dockerized-workstation:latest
   except:
     - master
 

From 0b0346e67aa97ed528bbaea626be6b0848de0e96 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Wed, 23 Jan 2019 19:14:14 +0000
Subject: [PATCH 6/7] trying something else

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1babdf2..07fe1c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,7 @@ build:
   stage: build
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - echo docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-    - docker push sneak/dockerized-workstation:latest
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
 

From 1c0d9edca13c8598005400cd44179c7e589eb076 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <jp@eeqj.com>
Date: Thu, 24 Jan 2019 06:50:47 +0000
Subject: [PATCH 7/7] tag and push datestamped images too

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07fe1c3..909c665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,8 @@ build-master:
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE" .
     - docker push "$CI_REGISTRY_IMAGE"
+    - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:v$(date -u +%Y%m%d)"
+    - docker push "$CI_REGISTRY_IMAGE:v$(date -u +%Y%m%d)"
   only:
     - master
 
@@ -21,6 +23,8 @@ build:
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-v$(date -u +%Y%m%d)"
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-v$(date -u +%Y%m%d)"
   except:
     - master