Merge pull request #4 from cblauvelt/develop

Merge version changes into main

Author: cblauvelt

.github/workflows/docker-image.yml

@@ -1,12 +1,22 @@
-name: Docker Image CI
+name: Docker Build
 
 on:
   push:
-    branches: [main, develop]
+    branches: [develop]
+
   pull_request:
-    branches: [main]
+    branches: [develop]
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: hadolint/[email protected]
+        with:
+          dockerfile: Dockerfile
+
   build:
     runs-on: ubuntu-latest
 

.github/workflows/docker-publish.yml

@@ -1,13 +1,11 @@
-name: Docker
+name: Docker Build and Publish
 
 # This workflow uses actions that are not certified by GitHub.
 # They are provided by a third-party and are governed by
 # separate terms of service, privacy policy, and support
 # documentation.
 
 on:
-  schedule:
-    - cron: "43 14 * * *"
   push:
     branches: [main]
     # Publish semver tags as releases.

Dockerfile

@@ -4,14 +4,11 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-ubuntu-20.04
 
 ENV GCC_VERSION=10 \
     CLANG_VERSION=11 \
-    CONAN_VERSION="1.38.0" \
+    CONAN_VERSION="1.39.0" \
     CONAN_PKG_VERSION="0.35.1" \
-    CMAKE_VERSION_FULL=3.18.2 \
+    CMAKE_VERSION_FULL="3.21.1.post1" \
     CC=/usr/bin/gcc \
     CXX=/usr/bin/g++ \
-    PYENV_ROOT=/opt/pyenv \
-    PYTHON_VERSION=3.7.5 \
-    PATH=/opt/pyenv/shims:${PATH} \
     DEBIAN_FRONTEND=noninteractive
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

README.md

@@ -8,7 +8,8 @@ A VSCode remote capable container that contains gcc, clang, and conan package ma
 | ------- | ----------------------------------------- |
 | GCC     | gcc (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 |
 | Clang   | clang version 11.0.0-2~ubuntu20.04.1      |
-| CMake   | cmake version 3.18.2                      |
+| CMake   | cmake version 3.21.1                      |
+| Conan   | Conan version 1.39.0                      |
 
 ## Example devcontainer file
 
@@ -19,7 +20,7 @@ Below is a sample .devcontainer file that you can use for your project. It inclu
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/cpp
 {
   "name": "C++",
-  "image": "vscode-cpp",
+  "image": "cblauvelt/vscode-cpp",
   "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
   // Set *default* container specific settings.json values on container create.
   "settings": {},