Lgunn4/updating config

.github/workflows/to-dockerhub.yml

@@ -1,25 +1,45 @@
-name: Publish to Docker Hub
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# GitHub recommends pinning actions to a commit SHA.
+# To get a newer version, you will need to update the SHA.
+# You can also reference a tag or branch, but the action may change without warning.
+
+name: Publish Docker image
+
 on:
   push:
-    branches:
-      - main
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
+          images: logunn78/code-server
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          context: .
+          file: ./Dockerfile
           push: true
-          tags: bencdr/code-server-deploy-container:latest
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -29,14 +29,35 @@ RUN sudo chown -R coder:coder /home/coder/.local
 # Install apt packages:
 # RUN sudo apt-get install -y ubuntu-make
 
-# Copy files: 
-# COPY deploy-container/myTool /home/coder/myTool
+# Install rbenv and dependencies
+RUN sudo apt-get install  -y git curl libssl-dev libreadline-dev zlib1g-dev autoconf bison build-essential libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev
+RUN curl -fsSL https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer | bash
+RUN echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+RUN echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+
+RUN ~/.rbenv/bin/rbenv install 3.2.2
+
+
+# Installing Node
+ENV NVM_DIR /home/coder/.nvm
+ENV NODE_VERSION 20.5.0
+
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.20.0/install.sh | bash 
+
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH      $NVM_DIR/v$NODE_VERSION/bin:$PATH
+
+RUN sudo apt-get install -y nodejs
+RUN sudo apt-get install -y npm
+RUN sudo apt-get update
+RUN sudo apt-get upgrade -y nodejs npm
+
+RUN git config --global user.email "lgunn4@uwo.ca" && git config --global user.name "Logan Gunn"
 
-# -----------
 
 # Port
-ENV PORT=8080
+ENV PORT=3000
 
 # Use our custom entrypoint script first
 COPY deploy-container/entrypoint.sh /usr/bin/deploy-container-entrypoint.sh
-ENTRYPOINT ["/usr/bin/deploy-container-entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/deploy-container-entrypoint.sh"]

deploy-container/entrypoint.sh

@@ -20,7 +20,7 @@ if [[ -z "${RCLONE_DATA}" ]]; then
 
 else
     echo "[$PREFIX] Copying rclone config..."
-    mkdir -p /home/coder/.config/rclone/
+    mkdir -p /home/coder/`.config/`rclone/
     touch /home/coder/.config/rclone/rclone.conf
     echo $RCLONE_DATA | base64 -d > /home/coder/.config/rclone/rclone.conf
 
@@ -97,4 +97,4 @@ fi
 
 echo "[$PREFIX] Starting code-server..."
 # Now we can run code-server with the default entrypoint
-/usr/bin/entrypoint.sh --bind-addr 0.0.0.0:8080 $START_DIR
+/usr/bin/entrypoint.sh --bind-addr 0.0.0.0:3000 $START_DIR

deploy-vm/launch-code-server-linode.sh

@@ -30,10 +30,9 @@ sudo hostnamectl set-hostname linode-$LINODE_ID
 source /root/.bashrc
 
 # configure code-server to use --link with the "coder" user
-mkdir -p /home/coder/.config/code-server
-touch /home/coder/.config/code-server/config.yaml
-echo "link: true" > /home/coder/.config/code-server/config.yaml
-chown -R coder:coder /home/coder/.config
+if [[ ! -d /home/coder/.config/code-server ]]; then
+    echo "NO config has been set; please set a config file at /home/coder/.config/code-server"
+fi
 
 # start and enable code-server and our helper service
 systemctl enable code-server@coder

deploy-vm/launch-code-server.sh

@@ -20,10 +20,10 @@ cp -r /root/.ssh /home/coder/.ssh
 chown -R coder:coder /home/coder/.ssh
 
 # configure code-server to use --link with the "coder" user
-mkdir -p /home/coder/.config/code-server
-touch /home/coder/.config/code-server/config.yaml
-echo "link: true" > /home/coder/.config/code-server/config.yaml
-chown -R coder:coder /home/coder/.config
+if [[ ! -d /home/coder/.config/code-server ]]; then
+    echo "NO config has been set; please set a config file at /home/coder/.config/code-server"
+fi
+
 
 # start and enable code-server and our helper service
 systemctl enable --now code-server@coder