From 4e3223439efcfa82779d3acdb7da4edcb88b1bfc Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sat, 8 Jun 2024 19:38:07 +0200 Subject: [PATCH 1/8] fix devcontainer --- .devcontainer/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d60b0cc49..b0be2d98e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -16,9 +16,11 @@ ARG USERNAME=node ARG USER_UID=1000 ARG USER_GID=$USER_UID +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list + # Configure apt and install packages RUN apt-get update \ - && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ + && apt-get -y install --no-install-recommends dialog 2>&1 \ # # Verify git and needed tools are installed && apt-get -y install git iproute2 procps \ From c95154cd7816dfdce268cbfffada18af65ac6153 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sat, 8 Jun 2024 20:28:14 +0200 Subject: [PATCH 2/8] fix scam autentication required --- .devcontainer/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 05475b824..c74079aef 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -36,11 +36,13 @@ services: - db db: - image: postgres + image: postgres:14-alpine restart: unless-stopped ports: - 5432:5432 + command: postgres -c password_encryption=md5 environment: + POSTGRES_INITDB_ARGS: "--auth-local=md5" POSTGRES_PASSWORD: pass POSTGRES_USER: user POSTGRES_DB: data From 1f1b539cf83d909317e4ccf8288b227ce5d344c0 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sat, 8 Jun 2024 21:09:02 +0200 Subject: [PATCH 3/8] fix connection --- .devcontainer/docker-compose.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index c74079aef..9902dc91e 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -version: '3' +version: '3.9' services: web: # Uncomment the next line to use a non-root user for all processes. You can also @@ -32,9 +32,15 @@ services: # Overrides default command so things don't shut down after the process ends. command: sleep infinity - links: + depends_on: - db + links: + - db:db + + networks: + - pgnetwork + db: image: postgres:14-alpine restart: unless-stopped @@ -42,8 +48,14 @@ services: - 5432:5432 command: postgres -c password_encryption=md5 environment: + POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_INITDB_ARGS: "--auth-local=md5" POSTGRES_PASSWORD: pass POSTGRES_USER: user POSTGRES_DB: data + networks: + - pgnetwork +networks: + pgnetwork: + driver: bridge From c0b705d2fc4a58914edb1b2d10123258b942aa46 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sat, 8 Jun 2024 21:09:25 +0200 Subject: [PATCH 4/8] install pg native lib --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b0be2d98e..c6425387f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update \ && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ && apt-get -y install --no-install-recommends yarn tmux locales postgresql \ + && apt-get install libpq-dev g++ make \ # # Install eslint globally && npm install -g eslint \ @@ -49,7 +50,6 @@ RUN apt-get update \ && apt-get install -y sudo \ && echo node ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ && chmod 0440 /etc/sudoers.d/$USERNAME \ - # # Clean up && apt-get autoremove -y \ && apt-get clean -y \ From fd1af11258a3333fb15636098adf267039a91fe2 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sat, 8 Jun 2024 21:23:41 +0200 Subject: [PATCH 5/8] fix: host --- packages/pg-native/test/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pg-native/test/index.js b/packages/pg-native/test/index.js index 1ef15b09f..26be85291 100644 --- a/packages/pg-native/test/index.js +++ b/packages/pg-native/test/index.js @@ -7,7 +7,7 @@ describe('connection', function () { }) it('connects with args', function (done) { - Client().connect('host=localhost', done) + Client().connect('host=db', done) }) it('errors out with bad connection args', function (done) { From f1823e38730228fc40bcaacec6800377876f0ac2 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sun, 23 Jun 2024 14:28:36 +0200 Subject: [PATCH 6/8] Update devcontainer.json --- .devcontainer/devcontainer.json | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 14fb67344..b282fd7d3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,28 +4,13 @@ "dockerComposeFile": "docker-compose.yml", "service": "web", "workspaceFolder": "/workspace", - - // Use 'settings' to set *default* container specific settings.json values on container create. - // You can edit these settings after create using File > Preferences > Settings > Remote. - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, - - // Uncomment the next line if you want start specific services in your Docker Compose config. - // "runServices": [], - - // Uncomment the line below if you want to keep your containers running after VS Code shuts down. - // "shutdownAction": "none", - - // Uncomment the next line to run commands after the container is created. - // "postCreateCommand": "npm install", - - // Uncomment the next line to have VS Code connect as an existing non-root user in the container. See - // https://aka.ms/vscode-remote/containers/non-root for details on adding a non-root user if none exist. - // "remoteUser": "node", - // Add the IDs of extensions you want installed when the container is created in the array below. - "extensions": [ - "dbaeumer.vscode-eslint" - ] -} \ No newline at end of file + "customizations":{ + "vscode": { + "extensions": ["dbaeumer.vscode-eslint"], + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + } + } + } +} From b8239f3d21fb66b72ced200be0eeed7748bf1b69 Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sun, 23 Jun 2024 14:29:04 +0200 Subject: [PATCH 7/8] Update docker-compose.yml --- .devcontainer/docker-compose.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 9902dc91e..11e652008 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -38,9 +38,6 @@ services: links: - db:db - networks: - - pgnetwork - db: image: postgres:14-alpine restart: unless-stopped @@ -53,9 +50,3 @@ services: POSTGRES_PASSWORD: pass POSTGRES_USER: user POSTGRES_DB: data - networks: - - pgnetwork - -networks: - pgnetwork: - driver: bridge From 7254ae7929faf749080fce2c47dd9c35540bc42c Mon Sep 17 00:00:00 2001 From: Nigro Simone Date: Sun, 23 Jun 2024 14:29:57 +0200 Subject: [PATCH 8/8] Update index.js --- packages/pg-native/test/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pg-native/test/index.js b/packages/pg-native/test/index.js index 26be85291..1ef15b09f 100644 --- a/packages/pg-native/test/index.js +++ b/packages/pg-native/test/index.js @@ -7,7 +7,7 @@ describe('connection', function () { }) it('connects with args', function (done) { - Client().connect('host=db', done) + Client().connect('host=localhost', done) }) it('errors out with bad connection args', function (done) {