From 750078ed5ae94c43e896cd065a921eea7de9d688 Mon Sep 17 00:00:00 2001
From: Leonardo Christino <leomilho@gmail.com>
Date: Wed, 3 May 2023 13:02:48 +0200
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/main' into
feat/query-builder-porting"
This reverts commit b930a17571fcb47ea6a10243d932b56071e31377.
---
.gitlab-ci.yml | 8 +++++++-
dockerfiles/build.dockerfile | 6 ------
dockerfiles/build.md | 17 -----------------
3 files changed, 7 insertions(+), 24 deletions(-)
delete mode 100644 dockerfiles/build.dockerfile
delete mode 100644 dockerfiles/build.md
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb4060bde..c19f4615e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
- build
default:
- image: registry.graphpolaris.com/library/frontend-builder:latest
+ image: nikolaik/python-nodejs:python3.11-nodejs19-alpine
cache: &cache
key:
files:
@@ -16,6 +16,12 @@ default:
- ./libs/shared/node_modules/
policy: pull
+before_script:
+ - npm i -g pnpm
+ - pnpm config set store-dir .pnpm-store
+ - apk add --no-cache --virtual .build-deps build-base g++ cairo-dev jpeg-dev pango-dev giflib-dev
+ - apk add --no-cache --virtual .runtime-deps cairo jpeg pango giflib
+
install:js:
stage: prepare
interruptible: true
diff --git a/dockerfiles/build.dockerfile b/dockerfiles/build.dockerfile
deleted file mode 100644
index b70cce044..000000000
--- a/dockerfiles/build.dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM nikolaik/python-nodejs:python3.11-nodejs19-alpine
-
-RUN npm i -g pnpm
-RUN pnpm config set store-dir .pnpm-store
-RUN apk add --no-cache --virtual .build-deps build-base g++ cairo-dev jpeg-dev pango-dev giflib-dev
-RUN apk add --no-cache --virtual .runtime-deps cairo jpeg pango giflib
\ No newline at end of file
diff --git a/dockerfiles/build.md b/dockerfiles/build.md
deleted file mode 100644
index 0279090b3..000000000
--- a/dockerfiles/build.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Builder image instructions
-
-login to docker repo
-
-`docker login https://registry.graphpolaris.com/`
-
-Build image with name/tag
-
-`docker build -t registry.graphpolaris.com/library/frontend-builder:0.0.1 - < build.dockerfile`
-`docker build -t registry.graphpolaris.com/library/frontend-builder:latest - < build.dockerfile`
-
-or change the tag
-`docker tag OLDTAG registry.graphpolaris.com/library/frontend-builder:latest`
-
-push image to repo
-
-`docker push registry.graphpolaris.com/library/frontend-builder:latest`
--
GitLab