Merge branch 'master' into make-nginx-proxy-http-version-configurable
This commit is contained in:
91 files changed
+561
-202
No files matched your search
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.27.1
|
||||
FROM golang:1.27.2
|
||||
|
||||
EXPOSE 3000/tcp
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.27.1
|
||||
FROM golang:1.27.2
|
||||
|
||||
EXPOSE 3000/tcp
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.27.1
|
||||
FROM golang:1.27.2
|
||||
|
||||
RUN mkdir /app
|
||||
WORKDIR /app
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/dokku/dokko/tests/apps/gorpc
|
||||
|
||||
go 1.26.2
|
||||
go 1.27.1
|
||||
|
||||
require (
|
||||
golang.org/x/net v0.58.0 // indirect
|
||||
|
||||
Generated
+4
-4
@@ -11,7 +11,7 @@
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.8",
|
||||
"sass": "^1.105.1"
|
||||
"sass": "^1.105.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": "24.x.x",
|
||||
@@ -432,9 +432,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/sass": {
|
||||
"version": "1.105.1",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.105.1.tgz",
|
||||
"integrity": "sha512-1CnAWPyrrnVQzXGB/DUep1vYCKCm1CIBr+YxjjiW6wk9qtzemnGP4qicH56T2F9S4Hjtv/Ne3jDz8JqfdDU4oA==",
|
||||
"version": "1.105.2",
|
||||
"resolved": "https://registry.npmjs.org/sass/-/sass-1.105.2.tgz",
|
||||
"integrity": "sha512-KxW6ZKZiBKWK3ziQ4YZ3cpqo8/1TlHXE8t9nBNvGDZFoBFbk2MD7RacxYFs8zy8hzeFwpFYkVyAhboi47uYPEQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"chokidar": "^5.0.0",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"author": "Al Johri",
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.8",
|
||||
"sass": "^1.105.1"
|
||||
"sass": "^1.105.2"
|
||||
},
|
||||
"description": "Test application for heroku multi buildpack.",
|
||||
"engines": {
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
module dokku.me/web
|
||||
|
||||
go 1.26.2
|
||||
go 1.27.1
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.27.1
|
||||
FROM golang:1.27.2
|
||||
|
||||
ADD . /go/src/github.com/dokku/apps/web
|
||||
WORKDIR /go/src/github.com/dokku/apps/web
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
module dokku.me/web
|
||||
|
||||
go 1.26.2
|
||||
go 1.27.1
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM golang:1.27.1
|
||||
FROM golang:1.27.2
|
||||
|
||||
ADD . /go/src/github.com/dokku/apps/web
|
||||
WORKDIR /go/src/github.com/dokku/apps/web
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
module dokku.me/web
|
||||
|
||||
go 1.26.2
|
||||
go 1.27.1
|
||||
@@ -59,6 +59,22 @@ teardown() {
|
||||
echo "status: $status"
|
||||
assert_output "536870912"
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory 1G $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
CID=$(<$DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
|
||||
run /bin/bash -c "docker inspect --format '{{.HostConfig.Memory}}' $CID"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_output "1073741824"
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory 512 $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
|
||||
@@ -131,3 +131,80 @@ teardown() {
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
}
|
||||
|
||||
@test "(resource) resource:limit uppercase memory units" {
|
||||
run /bin/bash -c "dokku resource:limit --memory 1G --memory-swap 2G $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku resource:reserve --memory 512M $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run_plugin_script resource docker-args-process-deploy "$TEST_APP" herokuish "dokku/$TEST_APP:latest" web "< /dev/null"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
assert_output_contains "--memory=1G "
|
||||
assert_output_contains "--memory-swap=2G "
|
||||
assert_output_contains "--memory-reservation=512M "
|
||||
assert_output_not_contains "1Gm"
|
||||
assert_output_not_contains "512Mm"
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory 1G --process-type build $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run_plugn_trigger docker-args-process-build "$TEST_APP" herokuish
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
assert_output_contains "--memory=1G "
|
||||
assert_output_not_contains "1Gm"
|
||||
}
|
||||
|
||||
@test "(resource) resource:limit rejects invalid memory values" {
|
||||
run /bin/bash -c "dokku resource:limit --memory '100G --foo' $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory 1x $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory-swap 1x $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:reserve --memory 1Gm $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:report --resource-_default_.limit.memory $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:report --resource-_default_.reserve.memory $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
|
||||
run /bin/bash -c "dokku resource:limit --memory-swap -1 $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku resource:report --resource-_default_.limit.memory-swap $TEST_APP"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
assert_output "-1"
|
||||
}
|
||||
Reference in new issue
Block a user