Skip to content

Commit 567c7e0

Browse files
committed
Fix JFrog certificate issues and version bump
1 parent 48dd659 commit 567c7e0

File tree

5 files changed

+26
-10
lines changed

5 files changed

+26
-10
lines changed

.vscode/tasks.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66
{
77
"label": "docker build",
88
"type": "shell",
9-
"command": "docker build -t cblauvelt/vscode-cpp .",
9+
"command": "docker build -t cblauvelt/vscode-cpp:latest .",
1010
"problemMatcher": [],
1111
"group": {
1212
"kind": "build",
1313
"isDefault": true
1414
}
15+
},
16+
{
17+
"label": "docker lint",
18+
"type": "shell",
19+
"command": "docker run --rm -i hadolint/hadolint < Dockerfile",
20+
"problemMatcher": []
1521
}
1622
]
1723
}

Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-ubuntu-20.04
44

55
ENV GCC_VERSION=10 \
66
CLANG_VERSION=11 \
7-
CONAN_VERSION="1.39.0" \
7+
CONAN_VERSION="1.40.3" \
88
CONAN_PKG_VERSION="0.35.1" \
9-
CMAKE_VERSION_FULL="3.21.1.post1" \
9+
CMAKE_VERSION_FULL="3.21.2" \
1010
CC=/usr/bin/gcc \
1111
CXX=/usr/bin/g++ \
1212
DEBIAN_FRONTEND=noninteractive
@@ -61,10 +61,8 @@ RUN apt-get -qq update \
6161
&& curl -fL https://getcli.jfrog.io | sh \
6262
&& mv jfrog /usr/local/bin/jfrog \
6363
&& chmod +x /usr/local/bin/jfrog \
64-
&& groupadd 1001 -g 1001 \
65-
&& groupadd 2000 -g 2000 \
66-
&& groupadd 999 -g 999 \
67-
&& usermod -aG 1001,2000,999 vscode \
6864
&& pip install -q --upgrade --no-cache-dir pip==21.2.1 \
6965
&& pip install -q --no-cache-dir conan==${CONAN_VERSION} conan-package-tools==${CONAN_PKG_VERSION} cmake==${CMAKE_VERSION_FULL}
70-
66+
67+
68+
COPY default-profile /home/vscode/.conan/profiles/default

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 cblauvelt
3+
Copyright (c) 2021 Christopher Blauvelt
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A VSCode remote capable container that contains gcc, clang, and conan package ma
99
| GCC | gcc (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 |
1010
| Clang | clang version 11.0.0-2~ubuntu20.04.1 |
1111
| CMake | cmake version 3.21.1 |
12-
| Conan | Conan version 1.39.0 |
12+
| Conan | Conan version 1.40.3 |
1313

1414
## Example devcontainer file
1515

default-profile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[settings]
2+
os=Linux
3+
os_build=Linux
4+
arch=x86_64
5+
arch_build=x86_64
6+
compiler=gcc
7+
compiler.version=10
8+
compiler.libcxx=libstdc++11
9+
build_type=Release
10+
[options]
11+
[build_requires]
12+
[env]

0 commit comments

Comments
 (0)