diff --git a/Dockerfile b/Dockerfile index d1ebac2d2e0e0..49918ce7b5886 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # syntax=docker/dockerfile:1 ARG BASE_IMAGE=406095609952.dkr.ecr.us-east-1.amazonaws.com/alpine:3.12.1 -ARG JS_IMAGE=406095609952.dkr.ecr.us-east-1.amazonaws.com/node:20.8.1-slim +ARG JS_IMAGE=406095609952.dkr.ecr.us-east-1.amazonaws.com/node:20.8.1-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=406095609952.dkr.ecr.us-east-1.amazonaws.com/golang:1.21.5-alpine3.18 +ARG GO_IMAGE=406095609952.dkr.ecr.us-east-1.amazonaws.com/golang:1.21.8-alpine3.18 ARG GO_SRC=go-builder ARG JS_SRC=js-builder diff --git a/package.json b/package.json index bf6fe7e4ad2af..c7e6c5f2daadb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "version": "11.0.0-pre", "repository": "github:grafana/grafana", "scripts": { - "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js", + "LOGZIO CHANGE :: DEV-44343 - fix run with NX": true, + "build": "NODE_ENV=production webpack --config scripts/webpack/webpack.prod.js", "build:nominify": "yarn run build -- --env noMinify=1", "dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js", "e2e": "./e2e/start-and-run-suite",