Skip to content

logo updates #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# Exclude everything by default
**

# Include necessary files for building
!package.json
!package-lock.json
!tsconfig.json
!src/
!lib/
!patches/
!ci/
!release-packages
!ci
!.git/
!.gitmodules
!eslint.config.mjs
!.prettierrc.yaml
!.prettierignore
!.editorconfig
!.node-version
!.nvmrc
!test/
64 changes: 60 additions & 4 deletions ci/release-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,64 @@
# syntax=docker/dockerfile:experimental

ARG BASE=debian:12

# ==============================================================================
# Builder Stage
# This stage builds code-server from source and creates a .deb package.
# ==============================================================================
FROM node:20-bookworm as builder

# TARGETARCH is automatically set by Docker to the architecture of the build machine (e.g., amd64, arm64)
ARG TARGETARCH

# Install build dependencies.
# nfpm is used for creating .deb packages.
# We download the correct version for the target architecture.
RUN apt-get update && apt-get install -y git curl rsync jq \
&& NFPM_ARCH=${TARGETARCH} && \
if [ "${TARGETARCH}" = "amd64" ]; then NFPM_ARCH="x86_64"; fi && \
curl -sL "https://github.com/goreleaser/nfpm/releases/download/v2.35.3/nfpm_2.35.3_Linux_${NFPM_ARCH}.tar.gz" | tar -xz -C /usr/local/bin nfpm \
&& chmod +x /usr/local/bin/nfpm

WORKDIR /app

# Copy the entire project source. We need the .git directory for versioning.
COPY . .

# Initialize git submodules.
# Running as root in the container, so we need to mark the directory as safe.
RUN git config --global --add safe.directory /app && git submodule update --init --recursive

# Install all dependencies.
RUN npm install

RUN cd lib/vscode && npm install

# Build and package code-server.
# All build scripts will now run in a Linux environment, producing the correct artifacts.
ENV VERSION=0.0.1
# ENV NODE_OPTIONS="--max-old-space-size=4096"
RUN npm run build:vscode
RUN npm run build
RUN npm run release:standalone
RUN npm run package
# RUN ./ci/build/build-release.sh
# RUN ./ci/build/build-packages.sh


# ==============================================================================
# Packages Stage
# This stage simply holds the .deb file for the final image.
# ==============================================================================
FROM scratch AS packages
COPY release-packages/code-server*.deb /tmp/

# Copy the .deb package from the builder stage.
COPY --from=builder /app/release-packages/code-server*${TARGETARCH}*.deb /tmp/


# ==============================================================================
# Final Stage
# This is the original Dockerfile, mostly unmodified.
# ==============================================================================
FROM $BASE

RUN apt-get update \
Expand Down Expand Up @@ -45,7 +100,8 @@ RUN ARCH="$(dpkg --print-architecture)" \
&& printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml

COPY ci/release-image/entrypoint.sh /usr/bin/entrypoint.sh
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages dpkg -i /tmp/packages/code-server*$(dpkg --print-architecture).deb
# The glob pattern here is simplified since we now know the exact architecture.
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages dpkg -i /tmp/packages/code-server*.deb

# Allow users to have scripts run on container startup to prepare workspace.
# https://github.com/coder/code-server/issues/5177
Expand All @@ -58,4 +114,4 @@ EXPOSE 8080
USER 1000
ENV USER=coder
WORKDIR /home/coder
ENTRYPOINT ["/usr/bin/entrypoint.sh", "--bind-addr", "0.0.0.0:8080", "."]
ENTRYPOINT ["/usr/bin/entrypoint.sh", "--bind-addr", "0.0.0.0:8080", "."]
12 changes: 6 additions & 6 deletions patches/getting-started.diff
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
import './gettingStartedColors.js';
@@ -874,6 +874,72 @@ export class GettingStartedPage extends
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "The One-Stop Quantum Platform"))
);

+ let gettingStartedCoder: HTMLElement = $('.header', {});
Expand All @@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
+ style: 'margin-bottom: 12px',
+ }, 'Next Up'),
+ $('a', {
+ href: 'https://cdr.co/code-server-to-coder',
+ href: 'https://account.qbraid.com/account-details',
+ target: '_blank',
+ },
+ $('button', {
Expand All @@ -57,21 +57,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
+ 'margin: 0px 0px 6px',
+ 'font-weight: 500',
+ ].join(';'),
+ }, 'Deploy code-server for your team'),
+ }, 'Run Quantum Jobs with qBraid'),
+ $('p', {
+ style: [
+ 'margin: 0',
+ 'font-size: 13px',
+ 'color: #dcdee2',
+ ].join(';'),
+ }, 'Provision software development environments on your infrastructure with Coder.'),
+ }, 'Submit quantum programs to 24+ devices using the qBraid-SDK.'),
+ $('p', {
+ style: [
+ 'margin-top: 8px',
+ 'font-size: 13px',
+ 'color: #dcdee2',
+ ].join(';'),
+ }, 'Coder is a self-service portal which provisions via Terraform—Linux, macOS, Windows, x86, ARM, and, of course, Kubernetes based infrastructure.'),
+ }, 'Access QPUs from QuEra, IQM, IonQ, OQC, and Rigetti, along with on-demand simulators from qBraid, AWS, IonQ, and more.'),
+ $('p', {
+ style: [
+ 'margin: 0',
Expand All @@ -80,7 +80,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
+ 'display: flex',
+ 'align-items: center',
+ ].join(';'),
+ }, 'Get started ', $('span', {
+ }, 'Get credits', $('span', {
+ class: ThemeIcon.asClassName(Codicon.arrowRight),
+ style: [
+ 'color: white',
Expand Down
8 changes: 1 addition & 7 deletions src/browser/media/favicon-dark-support.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/browser/media/favicon.ico
Binary file not shown.
1 change: 0 additions & 1 deletion src/browser/media/favicon.svg

This file was deleted.

Binary file modified src/browser/media/pwa-icon-192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/browser/media/pwa-icon-512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/browser/media/pwa-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/browser/media/templates.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.