Skip to content

Commit 13dedad

Browse files
committed
chore(workflow): remove py env
1 parent 4f04617 commit 13dedad

2 files changed

Lines changed: 15 additions & 26 deletions

File tree

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ WORKDIR /app
66

77
RUN export DEBIAN_FRONTEND=noninteractive \
88
&& install-stack python $PYTHON_VERSION && . init-stack \
9-
&& python -m venv /usr/local/env \
10-
&& source /usr/local/env/bin/activate \
11-
&& pip install -r requirements.txt
9+
&& set -eux; pip3 install -r requirements.txt 2>/dev/null
1210

1311
EXPOSE 8000
14-
CMD ["PATH=/usr/local/env/bin:\$PATH", "mkdocs", "serve", "-a", "0.0.0.0:8000"]
12+
CMD ["mkdocs", "serve", "-a", "0.0.0.0:8000"]

_scripts/install.sh

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -155,33 +155,24 @@ function install_components {
155155
--set k8sServicePort=${api_server[2]} \
156156
--set hostPort.enabled=true \
157157
--namespace kube-system --wait
158-
159-
helm install metallb drycc/metallb --namespace metallb --create-namespace --wait
158+
160159
if [[ -z "${METALLB_CONFIG_FILE}" ]] ; then
161-
kubectl apply -f - <<EOF
162-
apiVersion: v1
163-
kind: ConfigMap
164-
metadata:
165-
name: metallb
166-
namespace: metallb
167-
labels:
168-
app.kubernetes.io/managed-by: Helm
169-
data:
170-
config: |
171-
address-pools:
172-
- addresses:
173-
- $(ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p')/32
174-
name: public
175-
protocol: layer2
176-
- addresses:
177-
- 172.16.0.0/12
178-
name: default
179-
protocol: layer2
160+
helm install metallb drycc/metallb --namespace metallb --create-namespace --wait -f - <<EOF
161+
configInline:
162+
address-pools:
163+
- addresses:
164+
- $(ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p')/32
165+
name: public
166+
protocol: layer2
167+
- addresses:
168+
- 172.16.0.0/12
169+
name: default
170+
protocol: layer2
180171
EOF
181172
echo -e "\\033[32m---> Metallb using the default configuration.\\033[0m"
182173
kubectl get cm metallb -n metallb -o yaml
183174
else
184-
kubectl apply -n metallb -f ${METALLB_CONFIG_FILE}
175+
helm install metallb drycc/metallb --namespace metallb --create-namespace --wait -f ${METALLB_CONFIG_FILE}
185176
fi
186177

187178
helm install traefik drycc/traefik \

0 commit comments

Comments
 (0)