Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.

Commit 6c9f1d3

Browse files
committed
upping the version number to 3, and updating the cpptools in each of the x86 to use the latest
1 parent 9fd0851 commit 6c9f1d3

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

ConfigConstants.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ HElib_cmake_lists_version='2.1.0'
3333
Boost_version='1.72.0'
3434
Boost_filename='1_72_0'
3535
TEST_VAR_NAME='20.1.10'
36-
TOOLKIT_VERSION='1'
36+
TOOLKIT_VERSION='3'

Dockerfile.ALPINE-amd64.Toolkit

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ RUN apk add --no-cache openssl python3 pkgconfig xterm libx11-dev libxkbfile-dev
2121
RUN yarn global add node-gyp
2222
RUN yarn global add node-pty
2323
RUN yarn global add code-server
24-
#Install cpptools from the latest vsix version which we are pinning to becuase we have issues getting it to install normally - 12.03.2020 - greg
25-
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
24+
#Install cpptools from the latest vsix version which we are pinning to because we have issues getting it to install normally - 12.03.2020 - greg
25+
#Previously this was version 1.1.2 and we update to 1.4.0 - 06.02.2021 - greg
26+
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.4.0/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
2627

2728
# Create a directory to hold the VSCode user data when running as root
2829
RUN mkdir -p /opt/IBM/IDE-Data
@@ -48,8 +49,6 @@ ENV HELAYERS_DATA_SETS_DIR="/opt/IBM/FHE-Workspace/examples/data/"
4849
ENV HELAYERS_EXAMPLES_DIR="/opt/IBM/FHE-Workspace/examples/"
4950

5051
# Install VSCode extensions
51-
#We are installing the cpptools from a specific vsix version manually because it fails to install the traditional way. This version is 1.1.2 which is the latest at this time 12.02.2020 - greg
52-
#https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix
5352
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension /opt/IBM/FHE-Workspace/cpptools-linux.vsix --force; exit 0
5453
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension ms-vscode.cmake-tools --force
5554
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension twxs.cmake --force

Dockerfile.CENTOS-amd64.Toolkit

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ WORKDIR /root
1717
# Install code-server so we can access the IDE from a container context...
1818
#RUN curl -fsSL https://code-server.dev/install.sh | sh 2>&1
1919
RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1 2>&1
20-
#Install cpptools from the latest vsix version which we are pinning to becuase we have issues getting it to install normally - 12.03.2020 - greg
21-
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
20+
#Install cpptools from the latest vsix version which we are pinning to because we have issues getting it to install normally - 12.03.2020 - greg
21+
#Previously this was version 1.1.2 and we update to 1.4.0 - 06.02.2021 - greg
22+
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.4.0/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
2223

2324
# Create a directory to hold the VSCode user data
2425
RUN mkdir -p /opt/IBM/IDE-Data
@@ -45,8 +46,6 @@ ENV HELAYERS_EXAMPLES_DIR="/opt/IBM/FHE-Workspace/examples/"
4546

4647

4748
# Install code-server extensions
48-
#We are installing the cpptools from a specific vsix version manually because it fails to install the traditional way. This version is 1.1.2 which is the latest at this time 12.02.2020 - greg
49-
#https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix
5049
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension /opt/IBM/FHE-Workspace/cpptools-linux.vsix --force; exit 0
5150
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension ms-vscode.cmake-tools --force
5251
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension twxs.cmake --force

Dockerfile.FEDORA-amd64.Toolkit

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ WORKDIR /root
1717
# Install code-server so we can access the IDE from a container context...
1818
#RUN curl -fsSL https://code-server.dev/install.sh | sh 2>&1
1919
RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1 2>&1
20-
#Install cpptools from the latest vsix version which we are pinning to becuase we have issues getting it to install normally - 12.03.2020 - greg
21-
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
20+
#Install cpptools from the latest vsix version which we are pinning to because we have issues getting it to install normally - 12.03.2020 - greg
21+
#Previously this was version 1.1.2 and we update to 1.4.0 - 06.02.2021 - greg
22+
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.4.0/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
2223

2324
# Create a directory to hold the VSCode user data
2425
RUN mkdir -p /opt/IBM/IDE-Data

Dockerfile.UBUNTU-amd64.Toolkit

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ RUN export DEBIAN_FRONTEND=noninteractive
2121
#RUN curl -fsSL https://code-server.dev/install.sh | sh
2222
RUN curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 3.9.1
2323

24-
#Install cpptools from the latest vsix version which we are pinning to becuase we have issues getting it to install normally - 12.03.2020 - greg
25-
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
24+
#Install cpptools from the latest vsix version which we are pinning to because we have issues getting it to install normally - 12.03.2020 - greg
25+
#Previously this was version 1.1.2 and we update to 1.4.0 - 06.02.2021 - greg
26+
ADD https://github.com/microsoft/vscode-cpptools/releases/download/1.4.0/cpptools-linux.vsix /opt/IBM/FHE-Workspace/
2627

2728
# Create a directory to hold the VSCode user data
2829
RUN mkdir -p /opt/IBM/IDE-Data
@@ -49,8 +50,6 @@ ENV HELAYERS_EXAMPLES_DIR="/opt/IBM/FHE-Workspace/examples/"
4950

5051

5152
# Install code-server extensions
52-
#We are installing the cpptools from a specific vsix version manually because it fails to install the traditional way. This version is 1.1.2 which is the latest at this time 12.02.2020 - greg
53-
#https://github.com/microsoft/vscode-cpptools/releases/download/1.1.2/cpptools-linux.vsix
5453
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension /opt/IBM/FHE-Workspace/cpptools-linux.vsix --force; exit 0
5554
#RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension /opt/IBM/FHE-Workspace/cpptools.vsix --force; exit 0
5655
RUN code-server --user-data-dir=/opt/IBM/IDE-Data/ --install-extension ms-vscode.cmake-tools --force

0 commit comments

Comments
 (0)