Feature/code editor (#2)

Support for code-server based VSCode editor

.github/workflows/DiploiBuild.yaml

@@ -0,0 +1,90 @@
+name: DiploiBuild
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+  INITIAL_PROJECT_IMAGE_NAME: ${{ github.repository }}-initial-project
+
+jobs:
+
+  TemplateBuild:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64
+          pull: true
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  InitialProjectBuild:
+    needs: TemplateBuild
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.INITIAL_PROJECT_IMAGE_NAME }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: InitialProjectDockerfile
+          platforms: linux/arm64
+          pull: true
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+

Dockerfile

@@ -31,6 +31,10 @@ RUN echo "LC_ALL=en_US.UTF-8" >> /etc/environment && \
 RUN ln -s /etc/diploi-git/gitconfig /etc/gitconfig
 COPY diploi-credential-helper /usr/local/bin
 
+# Install code server
+RUN curl -fsSL https://code-server.dev/install.sh | sh
+COPY diploi-vscode-settings.json /usr/local/etc/diploi-vscode-settings.json
+
 # Init and run supervisor
 COPY diploi-runonce.sh /usr/local/bin/diploi-runonce.sh
 COPY supervisord.conf /etc/supervisord.conf

diploi-runonce.sh

@@ -45,6 +45,8 @@ if [ ! "$(ls -A /app)" ]; then
 
   # Configure the SQLTools VSCode extension
   # TODO: How to update these if env changes?
+  mkdir -p /root/.local/share/code-server/User
+  cp /usr/local/etc/diploi-vscode-settings.json /root/.local/share/code-server/User/settings.json
   cat > /app/.vscode/settings.json << EOL
 {
   "sqltools.connections": [
@@ -62,6 +64,8 @@ if [ ! "$(ls -A /app)" ]; then
 }
 EOL
 
+
+
   progress "Installing";
   npm install;
 
@@ -79,6 +83,7 @@ node /app/lib/seedDatabase.js
 
 # Now that everything is initialized, start all services
 supervisorctl start www
+supervisorctl start code-server
 
 progress "Runonce done";
 

diploi-template.yaml

@@ -62,6 +62,13 @@ hosts:
     identifier: app
     urlFormat: '[label].[default-domain]'
 
+editors:
+  - name: App
+    identifier: app
+    service: app
+    port: 3001
+    stages:
+      - development
 ssh:
   - usernameFormat: '[label]'
     contexts: label=app

diploi-vscode-settings.json

@@ -0,0 +1,4 @@
+{
+  "workbench.colorTheme": "Default Dark+",
+  "workbench.startupEditor": "none"
+}

initialProject/.gitignore

@@ -36,4 +36,4 @@ yarn-error.log*
 next-env.d.ts
 
 # VSCode settings
-/.vscode/settings.json
+/.vscode/settings.json

initialProject/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/diploi/nextjs-postgresql-template-arm64
+FROM ghcr.io/diploi/nextjs-postgresql-template
 
 # Install application code
 WORKDIR /app

supervisord.conf

@@ -52,3 +52,13 @@ stopasgroup=true
 killasgroup=true
 stdout_logfile=/var/log/status.log
 stderr_logfile=/var/log/status.log
+
+[program:code-server]
+directory=/app
+command=code-server --app-name Diploi --disable-getting-started-override --disable-workspace-trust --disable-update-check --disable-telemetry --auth none --bind-addr 0.0.0.0:3001 /app
+autostart=false
+autorestart=true
+stopasgroup=true
+killasgroup=true
+stdout_logfile=/var/log/code-server.log
+stderr_logfile=/var/log/code-server.log

templates/app-service.yaml

@@ -8,5 +8,7 @@ spec:
       name: app
     - port: 3000
       name: status
+    - port: 3001
+      name: editor
   selector:
     app: app

templates/app.yaml

@@ -39,6 +39,7 @@ spec:
           ports:
             - containerPort: 80
             - containerPort: 3000
+            - containerPort: 3001
           #startupProbe:
           #  exec:
           #    command: