Skip to content

Commit 986a700

Browse files
authored
Merge branch 'main' into sql-tests-2
2 parents 23f3a2e + 8b8c2a1 commit 986a700

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

appengine/building-an-app/build/app.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313

14+
# [START gae_build_app_yaml_node]
1415
# [START app_yaml]
1516
# [START gae_app_yaml]
1617
runtime: nodejs20
1718
# [END gae_app_yaml]
1819
# [END app_yaml]
20+
# [END gae_build_app_yaml_node]

appengine/building-an-app/build/test/server.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ const supertest = require('supertest');
1515
const path = require('path');
1616
const app = require(path.join(__dirname, '../', 'server.js'));
1717

18-
1918
describe('gae_app', () => {
2019
it('should be listening', async () => {
2120
await supertest(app).get('/').expect(200);
2221
});
23-
})
22+
});
2423

2524
describe('gae_build_web_server_app', () => {
2625
it('should be listening', async () => {
2726
await supertest(app).get('/').expect(200);
2827
});
29-
})
28+
});

appengine/building-an-app/update/app.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313

14+
# [START gae_update_app_yaml_node]
1415
# [START gae_app_yaml]
1516
# [START app_yaml]
1617
runtime: nodejs20
1718
# [END app_yaml]
1819
# [END gae_app_yaml]
20+
# [END gae_update_app_yaml_node]

run/image-processing/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# https://hub.docker.com/_/node
1717
FROM node:20-slim
1818
# [START cloudrun_imageproc_dockerfile_nodejs]
19-
# [START cloudrun_imageproc_dockerfile_imagemagick]
2019

2120
# Install Imagemagick into the container image.
2221
# For more on system packages review the system packages tutorial.
@@ -26,7 +25,6 @@ RUN set -ex; \
2625
apt-get -y install imagemagick; \
2726
rm -rf /var/lib/apt/lists/*
2827

29-
# [END cloudrun_imageproc_dockerfile_imagemagick]
3028
# [END cloudrun_imageproc_dockerfile_nodejs]
3129

3230
# Create and change to the app directory.

0 commit comments

Comments
 (0)