test(server): remove custom util container (#1568)

This commit is contained in:
Sander Bruens 2024-07-23 14:33:14 -04:00 committed by GitHub
parent 69f8e02daf
commit b5dbe650f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 22 deletions

View file

@ -47,7 +47,6 @@ readonly SHADOWBOX_IMAGE="${1?Must pass image name in the command line}"
readonly SHADOWBOX_CONTAINER="${NAMESPACE}_shadowbox"
readonly CLIENT_CONTAINER="${NAMESPACE}_client"
readonly CLIENT_IMAGE="${CLIENT_CONTAINER}"
readonly UTIL_IMAGE="${NAMESPACE}_util"
readonly NET_OPEN="${NAMESPACE}_open"
readonly NET_BLOCKED="${NAMESPACE}_blocked"
@ -66,7 +65,7 @@ function wait_for_resource() {
}
function util_jq() {
"${DOCKER}" run --rm -i --entrypoint jq "${UTIL_IMAGE}" "$@"
"${DOCKER}" run --rm -i ghcr.io/jqlang/jq "$@"
}
# Takes the JSON from a /access-keys POST request and returns the appropriate
@ -126,9 +125,6 @@ function setup() {
"${DOCKER}" build --force-rm -t "${CLIENT_IMAGE}" "$(dirname "$0")/client"
# Use -i to keep the container running.
"${DOCKER}" run -d --rm -it --network "${NET_BLOCKED}" --name "${CLIENT_CONTAINER}" "${CLIENT_IMAGE}"
# Utilities
"${DOCKER}" build --force-rm -t "${UTIL_IMAGE}" "$(dirname "$0")/util"
}
function remove_containers() {

View file

@ -1,17 +0,0 @@
# Copyright 2018 The Outline Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.19.1
RUN apk add --no-cache jq
ENTRYPOINT [ "sh" ]