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)"