diff --git a/.devcontainer/Dockerfile_JetPack b/.devcontainer/Dockerfile_JetPack index 395ef4f6..206acd1d 100644 --- a/.devcontainer/Dockerfile_JetPack +++ b/.devcontainer/Dockerfile_JetPack @@ -32,7 +32,7 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \ WORKDIR /opt # Install OpenCV from Source -ARG OPENCV_VERSION="4.7.0" +ARG OPENCV_VERSION="4.8.0" # Install OpenCV from Source RUN git clone --depth 1 --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git && \ diff --git a/.devcontainer/Dockerfile_Ubuntu b/.devcontainer/Dockerfile_Ubuntu index 59936807..6c544c7d 100644 --- a/.devcontainer/Dockerfile_Ubuntu +++ b/.devcontainer/Dockerfile_Ubuntu @@ -31,7 +31,7 @@ RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \ WORKDIR /opt # Install OpenCV from Source -ARG OPENCV_VERSION="4.7.0" +ARG OPENCV_VERSION="4.8.0" # Install OpenCV from Source RUN git clone --depth 1 --branch ${OPENCV_VERSION} https://github.com/opencv/opencv.git && \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 52e66696..e3b8e2c9 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,8 +9,8 @@ "-e DISPLAY", // Makes DISPLAY environment variable available in the container. // "-v /tmp/.X11-unix:/tmp/.X11-unix" // Required for container to access display. ], - "image": "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-16", - // "image": "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15", + "image": "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22", + // "image": "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22", // "build": { // "dockerfile": "Dockerfile_Ubuntu" // "dockerfile": "Dockerfile_JetPack" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ad18b65f..ac309acc 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -37,7 +37,7 @@ jobs: name: Analyze runs-on: ubuntu-latest container: - image: ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-08 + image: ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy_autonomy.yml b/.github/workflows/deploy_autonomy.yml index 4287663b..bf4184d6 100644 --- a/.github/workflows/deploy_autonomy.yml +++ b/.github/workflows/deploy_autonomy.yml @@ -23,31 +23,31 @@ jobs: os: [ubuntu-latest, [self-hosted, linux, ARM64]] container: [ - "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-16", - "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15", + "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22", + "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22", ] architecture: [AMD64, ARM64] exclude: - os: ubuntu-latest - container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-16" + container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22" architecture: ARM64 - os: ubuntu-latest - container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15" + container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22" architecture: ARM64 - os: ubuntu-latest - container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15" + container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22" architecture: ARM64 - os: ubuntu-latest - container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15" + container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22" architecture: AMD64 - os: [self-hosted, linux, ARM64] - container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-15" + container: "ghcr.io/missourimrdt/autonomy-jetpack:2023-07-22" architecture: AMD64 - os: [self-hosted, linux, ARM64] - container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-16" + container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22" architecture: AMD64 - os: [self-hosted, linux, ARM64] - container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-16" + container: "ghcr.io/missourimrdt/autonomy-ubuntu:2023-07-22" architecture: ARM64 runs-on: ${{ matrix.os }}