Skip to content

Commit 09fe6df

Browse files
Merge pull request #2 from qBraid/rh1-logos
logo updates
2 parents e849bd0 + 4565216 commit 09fe6df

10 files changed

Lines changed: 86 additions & 19 deletions

File tree

.dockerignore

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# Exclude everything by default
12
**
3+
4+
# Include necessary files for building
5+
!package.json
6+
!package-lock.json
7+
!tsconfig.json
8+
!src/
9+
!lib/
10+
!patches/
11+
!ci/
212
!release-packages
3-
!ci
13+
!.git/
14+
!.gitmodules
15+
!eslint.config.mjs
16+
!.prettierrc.yaml
17+
!.prettierignore
18+
!.editorconfig
19+
!.node-version
20+
!.nvmrc
21+
!test/

ci/release-image/Dockerfile

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,64 @@
11
# syntax=docker/dockerfile:experimental
2-
32
ARG BASE=debian:12
3+
4+
# ==============================================================================
5+
# Builder Stage
6+
# This stage builds code-server from source and creates a .deb package.
7+
# ==============================================================================
8+
FROM node:20-bookworm as builder
9+
10+
# TARGETARCH is automatically set by Docker to the architecture of the build machine (e.g., amd64, arm64)
11+
ARG TARGETARCH
12+
13+
# Install build dependencies.
14+
# nfpm is used for creating .deb packages.
15+
# We download the correct version for the target architecture.
16+
RUN apt-get update && apt-get install -y git curl rsync jq \
17+
&& NFPM_ARCH=${TARGETARCH} && \
18+
if [ "${TARGETARCH}" = "amd64" ]; then NFPM_ARCH="x86_64"; fi && \
19+
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 \
20+
&& chmod +x /usr/local/bin/nfpm
21+
22+
WORKDIR /app
23+
24+
# Copy the entire project source. We need the .git directory for versioning.
25+
COPY . .
26+
27+
# Initialize git submodules.
28+
# Running as root in the container, so we need to mark the directory as safe.
29+
RUN git config --global --add safe.directory /app && git submodule update --init --recursive
30+
31+
# Install all dependencies.
32+
RUN npm install
33+
34+
RUN cd lib/vscode && npm install
35+
36+
# Build and package code-server.
37+
# All build scripts will now run in a Linux environment, producing the correct artifacts.
38+
ENV VERSION=0.0.1
39+
# ENV NODE_OPTIONS="--max-old-space-size=4096"
40+
RUN npm run build:vscode
41+
RUN npm run build
42+
RUN npm run release:standalone
43+
RUN npm run package
44+
# RUN ./ci/build/build-release.sh
45+
# RUN ./ci/build/build-packages.sh
46+
47+
48+
# ==============================================================================
49+
# Packages Stage
50+
# This stage simply holds the .deb file for the final image.
51+
# ==============================================================================
452
FROM scratch AS packages
5-
COPY release-packages/code-server*.deb /tmp/
653

54+
# Copy the .deb package from the builder stage.
55+
COPY --from=builder /app/release-packages/code-server*${TARGETARCH}*.deb /tmp/
56+
57+
58+
# ==============================================================================
59+
# Final Stage
60+
# This is the original Dockerfile, mostly unmodified.
61+
# ==============================================================================
762
FROM $BASE
863

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

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

50106
# Allow users to have scripts run on container startup to prepare workspace.
51107
# https://github.com/coder/code-server/issues/5177
@@ -58,4 +114,4 @@ EXPOSE 8080
58114
USER 1000
59115
ENV USER=coder
60116
WORKDIR /home/coder
61-
ENTRYPOINT ["/usr/bin/entrypoint.sh", "--bind-addr", "0.0.0.0:8080", "."]
117+
ENTRYPOINT ["/usr/bin/entrypoint.sh", "--bind-addr", "0.0.0.0:8080", "."]

patches/getting-started.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
3131
@@ -874,6 +874,72 @@ export class GettingStartedPage extends
32-
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
32+
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "The One-Stop Quantum Platform"))
3333
);
3434

3535
+ let gettingStartedCoder: HTMLElement = $('.header', {});
@@ -39,7 +39,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
3939
+ style: 'margin-bottom: 12px',
4040
+ }, 'Next Up'),
4141
+ $('a', {
42-
+ href: 'https://cdr.co/code-server-to-coder',
42+
+ href: 'https://account.qbraid.com/account-details',
4343
+ target: '_blank',
4444
+ },
4545
+ $('button', {
@@ -57,21 +57,21 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
5757
+ 'margin: 0px 0px 6px',
5858
+ 'font-weight: 500',
5959
+ ].join(';'),
60-
+ }, 'Deploy code-server for your team'),
60+
+ }, 'Run Quantum Jobs with qBraid'),
6161
+ $('p', {
6262
+ style: [
6363
+ 'margin: 0',
6464
+ 'font-size: 13px',
6565
+ 'color: #dcdee2',
6666
+ ].join(';'),
67-
+ }, 'Provision software development environments on your infrastructure with Coder.'),
67+
+ }, 'Submit quantum programs to 24+ devices using the qBraid-SDK.'),
6868
+ $('p', {
6969
+ style: [
7070
+ 'margin-top: 8px',
7171
+ 'font-size: 13px',
7272
+ 'color: #dcdee2',
7373
+ ].join(';'),
74-
+ }, 'Coder is a self-service portal which provisions via Terraform—Linux, macOS, Windows, x86, ARM, and, of course, Kubernetes based infrastructure.'),
74+
+ }, 'Access QPUs from QuEra, IQM, IonQ, OQC, and Rigetti, along with on-demand simulators from qBraid, AWS, IonQ, and more.'),
7575
+ $('p', {
7676
+ style: [
7777
+ 'margin: 0',
@@ -80,7 +80,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
8080
+ 'display: flex',
8181
+ 'align-items: center',
8282
+ ].join(';'),
83-
+ }, 'Get started ', $('span', {
83+
+ }, 'Get credits', $('span', {
8484
+ class: ThemeIcon.asClassName(Codicon.arrowRight),
8585
+ style: [
8686
+ 'color: white',

src/browser/media/favicon-dark-support.svg

Lines changed: 1 addition & 7 deletions
Loading

src/browser/media/favicon.ico

10.3 KB
Binary file not shown.

src/browser/media/favicon.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/browser/media/pwa-icon-192.png

25.9 KB
Loading

src/browser/media/pwa-icon-512.png

61.3 KB
Loading

src/browser/media/pwa-icon.png

56.8 KB
Loading

src/browser/media/templates.png

49.3 KB
Loading

0 commit comments

Comments
 (0)