Skip to content

Commit

Permalink
update fork
Browse files Browse the repository at this point in the history
  • Loading branch information
blascoj2 committed May 3, 2022
2 parents 453cc15 + ea9ff7b commit ab52766
Show file tree
Hide file tree
Showing 54 changed files with 1,512 additions and 1,958 deletions.
12 changes: 12 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version = 1

[[analyzers]]
name = "shell"
enabled = true

[[analyzers]]
name = "go"
enabled = true

[analyzers.meta]
import_root = "github.com/devopsfaith/krakend-ce"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/help-and-questions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Help and questions
about: You are stuck trying to do something, get unexpected result or you simply have
a question or suggestion
title: ''
labels: ''
labels: 'question'
assignees: ''

---
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Go

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17

- name: Test
run: make test
31 changes: 31 additions & 0 deletions .github/workflows/lock-threads.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: 'Lock Threads'

on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:

permissions:
issues: write
pull-requests: write

concurrency:
group: lock

jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v3
with:
pr-inactive-days: '90'
issue-inactive-days: '90'
add-issue-labels: 'locked'
issue-comment: >
This issue was marked as resolved a long time ago and now has been
automatically locked as there has not been any recent activity after it.
You can still open a new issue and reference this link.
pr-comment: >
This pull request was marked as resolved a long time ago and now has been
automatically locked as there has not been any recent activity after it.
You can still open a new issue and reference this link.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/vendor
bench_res
sec_scan
krakend
krakend-alpine
cmd/krakend-integration/krakend-integration
Expand Down
14 changes: 0 additions & 14 deletions .travis.yml

This file was deleted.

28 changes: 18 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
FROM debian:buster-slim
ARG GOLANG_VERSION
ARG ALPINE_VERSION
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as builder

LABEL maintainer="[email protected]"
RUN apk --no-cache add make gcc musl-dev binutils-gold

RUN apt-get update && \
apt-get install -y ca-certificates && \
update-ca-certificates && \
rm -rf /var/lib/apt/lists/*
COPY . /app
WORKDIR /app

ADD krakend /usr/bin/krakend
RUN make build

RUN useradd -r -c "KrakenD user" -U krakend

USER krakend
FROM alpine:${ALPINE_VERSION}

VOLUME [ "/etc/krakend" ]
LABEL maintainer="[email protected]"

RUN apk add --no-cache ca-certificates && \
adduser -u 1000 -S -D -H krakend && \
mkdir /etc/krakend && \
echo '{ "version": 3 }' > /etc/krakend/krakend.json

COPY --from=builder /app/krakend /usr/bin/krakend

USER 1000

WORKDIR /etc/krakend

Expand Down
26 changes: 0 additions & 26 deletions Dockerfile.alpine

This file was deleted.

Loading

0 comments on commit ab52766

Please sign in to comment.