Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jenkins job #18

Merged
merged 8 commits into from
May 8, 2024
Merged

Jenkins job #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ed824c
Use original docker file
npololnskii Apr 11, 2024
d72bcf8
Use original docker file
npololnskii Apr 11, 2024
0706704
Use original docker file
npololnskii Apr 12, 2024
bc15f9f
Use original docker file
npololnskii Apr 15, 2024
628a953
Publish grafana to different repo
npololnskii Apr 25, 2024
4b14122
Some configs
npololnskii Apr 29, 2024
ba5bb38
Merge branch 'v10.4.x-logzio' into jenkins-job
npololnskii May 8, 2024
232ac50
Align docker file
npololnskii May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,4 @@ ARG RUN_SH=grafana/packaging/docker/run.sh
COPY ${RUN_SH} /run.sh

USER "$GF_UID"
ENTRYPOINT [ "/run.sh" ]
ENTRYPOINT [ "/run.sh" ]
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.

TAG_SUFFIX=$(if $(WIRE_TAGS)!=oss,-$(WIRE_TAGS))
PLATFORM=linux/amd64
GRAFANA_TAG=dev

build-docker-full-local:
@echo "build docker container"
Expand All @@ -251,19 +252,21 @@ build-docker-full: ## Build Docker image for development.
@echo "build docker container"
tar -ch . | \
docker buildx build - \
-f Dockerfile.local \
--platform $(PLATFORM) \
--build-arg BINGO=false \
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
--build-arg WIRE_TAGS=$(WIRE_TAGS) \
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--tag grafana/grafana$(TAG_SUFFIX):dev \
--tag 406095609952.dkr.ecr.us-east-1.amazonaws.com/grafana-x:$(GRAFANA_TAG) \
$(DOCKER_BUILD_ARGS)

build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
@echo "build docker container"
tar -ch . | \
docker buildx build - \
-f Dockerfile.local \
--platform $(PLATFORM) \
--build-arg BINGO=false \
--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
Expand All @@ -272,7 +275,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
--build-arg BASE_IMAGE=ubuntu:22.04 \
--build-arg GO_IMAGE=golang:1.21.8 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
--tag 406095609952.dkr.ecr.us-east-1.amazonaws.com/grafana-x:$(GRAFANA_TAG)-ubuntu \
$(DOCKER_BUILD_ARGS)

##@ Services
Expand Down
3 changes: 1 addition & 2 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ const schema = Joi.object({
port: Joi.number().default(3333),
});


module.exports = { schema };
module.exports = { schema };
2 changes: 1 addition & 1 deletion custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ min_refresh_interval = 30s

[log.frontend]
enabled = true
custom_endpoint = log
custom_endpoint = log
Loading