Skip to content

Commit

Permalink
Revert temporary changes used for bilbong backup
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-code committed Sep 22, 2023
1 parent 350817f commit 1964dec
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 33 deletions.
6 changes: 6 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,23 @@ default:
.images:
python:
name: acidrain/python-poetry:3.11-1.5.1
pull_policy: if-not-present
node:
name: registry.gitlab.com/wildland/devops/container-builder/octant/node-extended:latest
pull_policy: if-not-present
kaniko:
name: gcr.io/kaniko-project/executor:$KANIKO_VERSION-debug
pull_policy: if-not-present
entrypoint: [""]
git_improved:
name: mikecode/git-gettext:ubuntu
pull_policy: if-not-present
synpress:
name: registry.gitlab.com/wildland/devops/container-builder/octant/synpress-arch:179ba913
pull_policy: if-not-present
alpine_git:
name: alpine/git
pull_policy: if-not-present
entrypoint: [""]

.rules:
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.backend
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM acidrain/python-poetry:3.11-slim-1.5.1
FROM local-docker-registry.wildland.dev/acidrain/python-poetry:3.11-slim-1.5.1

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM local-docker-registry.wildland.dev/library/node:16-alpine
WORKDIR /app
COPY package.json yarn.lock ./
RUN yarn install --ignore-scripts --frozen-lockfile && yarn cache clean
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.coin-prices-server
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS root
FROM local-docker-registry.wildland.dev/library/node:16-alpine AS root
WORKDIR /app
COPY package.json yarn.lock ./

Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.contracts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS root
FROM local-docker-registry.wildland.dev/library/node:16-alpine AS root
WORKDIR /app

FROM root AS build
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.contracts-v1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS root
FROM local-docker-registry.wildland.dev/library/node:16-alpine AS root
WORKDIR /app

FROM root AS build
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.subgraph
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS root
FROM local-docker-registry.wildland.dev/library/node:16-alpine AS root
WORKDIR /app

FROM root AS build
Expand Down
27 changes: 0 additions & 27 deletions temporary-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +0,0 @@
# Remember to :
# - remove custom host rule for Full (not strict) TLS from @ CF
# - remove WAF that allows only k8s dev cluster egress
# - update IP back to bilbong
#
# - remove CI/CD env var that adds docker auths
# - remove SA key generated for this purpose
#
# - restore operations-developer-whitelist middleware on argo's ingress

apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: eth-rpc
namespace: octant-testnet
spec:
entryPoints:
- websecure
tls: {}
routes:
- match: Host(`geth.wildland.dev`)
kind: Rule
middlewares:
- name: cors-wildcard@file
services:
- name: eth-rpc-haproxy
port: 80

0 comments on commit 1964dec

Please sign in to comment.