Skip to content

Commit de76a92

Browse files
Merge branch 'main' into dependabot/github_actions/dorny/paths-filter-3
2 parents 6228e23 + 11dad0f commit de76a92

5 files changed

Lines changed: 18 additions & 2 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",
2+
"image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",
33
"features": {
44
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
55
},

src/cpp-mariadb/.devcontainer/reinstall-cmake.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,8 @@ curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/
5555
sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
5656
sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
5757

58+
ln -s /opt/cmake/bin/ccmake /usr/local/bin/ccmake
5859
ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
60+
ln -s /opt/cmake/bin/cmake-gui /usr/local/bin/cmake-gui
61+
ln -s /opt/cmake/bin/cpack /usr/local/bin/cpack
62+
ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest

src/cpp/.devcontainer/reinstall-cmake.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,8 @@ curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/
5555
sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
5656
sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
5757

58+
ln -s /opt/cmake/bin/ccmake /usr/local/bin/ccmake
5859
ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
60+
ln -s /opt/cmake/bin/cmake-gui /usr/local/bin/cmake-gui
61+
ln -s /opt/cmake/bin/cpack /usr/local/bin/cpack
5962
ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest

src/postgres/.devcontainer/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
POSTGRES_DB: postgres
2929
POSTGRES_PASSWORD: postgres
3030

31-
# Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
31+
# Add "forwardPorts": [5432] to **devcontainer.json** to forward PostgreSQL locally.
3232
# (Adding the "ports" property to this file will not forward from a Codespace.)
3333

3434
volumes:

src/ruby-rails-postgres/.devcontainer/docker-compose.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@ services:
4040
# username: postgres
4141
# password: postgres
4242
# database: myapp_development
43+
#
44+
# ...
45+
#
46+
# test:
47+
# <<: *default
48+
# host: db
49+
# username: postgres
50+
# password: postgres
51+
# database: myapp_test
4352

4453
# Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
4554
# (Adding the "ports" property to this file will not forward from a Codespace.)

0 commit comments

Comments
 (0)