Skip to content

Commit

Permalink
Make it build image
Browse files Browse the repository at this point in the history
  • Loading branch information
copyhold committed Mar 18, 2024
1 parent 9b25b45 commit 6b0ad6f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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-alpine

ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
Expand Down Expand Up @@ -57,6 +57,7 @@ COPY grafana/.bingo .bingo
COPY grafana/pkg/util/xorm/go.* pkg/util/xorm/
COPY grafana/pkg/apiserver/go.* pkg/apiserver/
COPY grafana/pkg/apimachinery/go.* pkg/apimachinery/
COPY grafana/pkg/promlib/go.* pkg/promlib/

RUN go mod download
RUN if [[ "$BINGO" = "true" ]]; then \
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 :: nx sees the wrong project path": 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",
Expand Down

0 comments on commit 6b0ad6f

Please sign in to comment.