fixed typo, added bash to package list
This commit is contained in:
parent
93e70acc93
commit
26dd9001fa
|
@ -18,6 +18,7 @@ apt update && apt upgrade -y
|
||||||
PKGS="
|
PKGS="
|
||||||
apt-file
|
apt-file
|
||||||
apt-utils
|
apt-utils
|
||||||
|
bash
|
||||||
bash-completion
|
bash-completion
|
||||||
build-essential
|
build-essential
|
||||||
byobu
|
byobu
|
||||||
|
|
|
@ -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
|
RUN git clone https://github.com/creationix/nvm.git /usr/local/nvm
|
||||||
ADD ./nvmsetup.sh /etc/profile.d/nvmsetup.sh
|
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 install --lts && \
|
||||||
nvm use default'
|
nvm use default'
|
||||||
|
|
||||||
|
@ -43,11 +43,10 @@ RUN \ bash -c 'source /etc/profile.d/nvmsetup.sh && \
|
||||||
##### javascript, my favorite
|
##### javascript, my favorite
|
||||||
########################################################
|
########################################################
|
||||||
# yes i know yarn says not to install it this way
|
# yes i know yarn says not to install it this way
|
||||||
RUN \
|
RUN bash -c 'source /etc/profile.d/nvmsetup.sh && \
|
||||||
source /etc/profile.d/nvmsetup.sh && \
|
|
||||||
nvm use default && \
|
nvm use default && \
|
||||||
npm install -g npm && \
|
npm install -g npm && \
|
||||||
npm install -g yarn
|
npm install -g yarn'
|
||||||
|
|
||||||
RUN yarn global add prettier
|
RUN yarn global add prettier
|
||||||
RUN yarn global add create-react-app
|
RUN yarn global add create-react-app
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -1,10 +1,11 @@
|
||||||
REMOTEHOST := root@las2.bounce
|
REMOTEHOST := root@las2.bounce
|
||||||
IMAGENAME := sneak/dockerized-workstation
|
IMAGENAME := sneak/dockerized-workstation
|
||||||
|
YYYYMMDD := $(shell date +%Y%m%d)
|
||||||
|
|
||||||
default: remote-build
|
default: remote-build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build -t $(IMAGENAME) .
|
docker build -t $(IMAGENAME):$(YYYYMMDD) .
|
||||||
|
|
||||||
upload:
|
upload:
|
||||||
rsync -avP --delete ./ $(REMOTEHOST):dockerized-workstation/
|
rsync -avP --delete ./ $(REMOTEHOST):dockerized-workstation/
|
||||||
|
@ -12,5 +13,8 @@ upload:
|
||||||
remote-build: upload
|
remote-build: upload
|
||||||
ssh -t $(REMOTEHOST) "cd dockerized-workstation && make build"
|
ssh -t $(REMOTEHOST) "cd dockerized-workstation && make build"
|
||||||
|
|
||||||
|
publish:
|
||||||
|
ssh -t $(REMOTEHOST) "cd dockerized-workstation && docker push $(IMAGENAME):$(YYYYMMDD)"
|
||||||
|
|
||||||
tryout:
|
tryout:
|
||||||
ssh -t $(REMOTEHOST) "docker run -ti $(IMAGENAME)"
|
ssh -t $(REMOTEHOST) "docker run -ti $(IMAGENAME)"
|
||||||
|
|
Loading…
Reference in New Issue