rescuetime

Dockerfile

@@ -1,19 +1,14 @@
 FROM stemn/development-environment:latest
 USER root
 
-ARG CONTAINER_BUILD_DATE
-ARG CONTAINER_GIT_SHA
-
 ENV BASE_USER stemn
-ENV CONTAINER_BUILD_DATE $CONTAINER_BUILD_DATE
-ENV CONTAINER_GIT_SHA $CONTAINER_GIT_SHA
 ENV USER jackson
 ENV HOME /$USER/home
-ENV SSH_AUTH_SOCK=/ssh-auth.sock
-ENV STEMN_GIT_EMAIL="jackson@stemn.com"
-ENV STEMN_GIT_NAME="Jackson Delahunt"
+ENV SSH_AUTH_SOCK /ssh-auth.sock
+ENV STEMN_GIT_EMAIL "jackson@stemn.com"
+ENV STEMN_GIT_NAME "Jackson Delahunt"
+ENV STEMN_TMUX_SESSION desktop-environment
 
-RUN echo $CONTAINER_BUILD_DATE
 # Keep the existing home directory
 RUN mkdir /$USER && \
   mv /$BASE_USER/home $HOME
@@ -52,12 +47,17 @@ RUN groupadd --system chrome && \
   usermod --groups audio,chrome,video $USER
 
 # Install vs code
-RUN echo 'deb http://au.archive.ubuntu.com/ubuntu/ bionic main restricted universe' > /etc/apt/sources.list && \
+RUN echo 'deb http://au.archive.ubuntu.com/ubuntu/ xenial main restricted universe' > /etc/apt/sources.list && \
   apt update && \
   wget -O code.deb -nv https://go.microsoft.com/fwlink/?LinkID=760868 && \
   apt install --yes ./code.deb && \
   rm code.deb
 
+# Install resucetime time tracker
+RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_current_amd64.deb && \
+  dpkg -i rescuetime.deb || apt --fix-broken --yes install && \
+  rm rescuetime.deb
+
 # Remove mock sudo
 RUN rm /usr/local/bin/sudo
 
@@ -89,5 +89,12 @@ COPY bin /usr/local/bin
 # Remove root ownership of all files under non-root user directory
 RUN chown -R $USER:$USER $HOME
 
+# Record container build information
+ARG CONTAINER_BUILD_DATE
+ARG CONTAINER_GIT_SHA
+ENV CONTAINER_BUILD_DATE $CONTAINER_BUILD_DATE
+ENV CONTAINER_GIT_SHA $CONTAINER_GIT_SHA
+
+# Become the desktop user
 USER $USER
 WORKDIR $HOME

config/zsh/.zshenv

@@ -1,13 +1,4 @@
 # Print container build info
 CURRENT_DATE=$(date +%s)
-TIME_SINCE_CONTAINER_BUILD=$(echo $((CURRENT_DATE-CONTAINER_BUILD_DATE)) | awk '{print int($1/60)":"int($1%60)}')
-echo "Container built: $CONTAINER_BUILD_DATE ($TIME_SINCE_CONTAINER_BUILD ago) | sha $CONTAINER_GIT_SHA"
-
-# Change to most used directory
-cd $HOME/repositories/stemn/stemn-backend
-
-# Always connect to the desktop-environment session
-export $STEMN_TMUX_SESSION=desktop-environment
-
-# Start the desktop-environment session if it isn't already started
-tmux new-session -d -s $STEMN_TMUX_SESSION tmuxinator desktop
+TIME_SINCE_CONTAINER_BUILD=$(echo $((CURRENT_DATE-CONTAINER_BUILD_DATE)) | awk '{print int($1/(60 * 60 * 24))" days "int($1/(60 * 60))" hrs "int($1/60)" mins "int($1%60)" secs ago"}')
+echo "\nContainer built $TIME_SINCE_CONTAINER_BUILD | sha $CONTAINER_GIT_SHA"

scripts/clean-hard.sh

@@ -1,2 +1,8 @@
+REPO_ROOT=$(dirname $(realpath $0))/..
+
+# Perform a basic clean
+sh $REPO_ROOT/scripts/clean.sh
+
+# Remove volumes that can be recreated from scratch, but require manual configuration in app
 docker volume rm JACKSON_CONFIG_CODE
 docker volume rm JACKSON_CONFIG_CHROME

scripts/clean.sh

@@ -1 +1,6 @@
+REPO_ROOT=$(dirname $(realpath $0))/..
+
+# Stop the running environment so there are no containers using the volumes
+sh $REPO_ROOT/scripts/stop.sh
+
 docker volume rm JACKSON_HOME

scripts/refresh.sh

@@ -0,0 +1,5 @@
+REPO_ROOT=$(dirname $(realpath $0))/..
+
+sh $REPO_ROOT/scripts/build.sh
+sh $REPO_ROOT/scripts/restart.sh
+sh $REPO_ROOT/scripts/shell.sh

scripts/restart.sh

@@ -1,4 +1,5 @@
 REPO_ROOT=$(dirname $(realpath $0))/..
 
 sh $REPO_ROOT/scripts/stop.sh
+sh $REPO_ROOT/scripts/clean.sh
 sh $REPO_ROOT/scripts/start.sh