Skip to content

Commit

Permalink
at long last, it makes sense
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanejohnson committed Jul 14, 2022
1 parent 5ae3b91 commit 2c072e7
Show file tree
Hide file tree
Showing 14 changed files with 64 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.18-alpine3.15 AS build
FROM golang:1.17-alpine3.16 AS build

ARG consul_version=1.8.2
ARG consul_version=1.12.3
ADD https://releases.hashicorp.com/consul/${consul_version}/consul_${consul_version}_linux_amd64.zip /usr/local/bin
RUN cd /usr/local/bin && unzip consul_${consul_version}_linux_amd64.zip

ARG vault_version=1.5.0
ARG vault_version=1.11.0
ADD https://releases.hashicorp.com/vault/${vault_version}/vault_${vault_version}_linux_amd64.zip /usr/local/bin
RUN cd /usr/local/bin && unzip vault_${vault_version}_linux_amd64.zip

Expand All @@ -14,7 +14,7 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -mod=vendor -trimpath -ldflags "-s -w" ./...
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -trimpath -ldflags "-s -w"

FROM alpine:3.15
FROM alpine:3.16
RUN apk update && apk add --no-cache ca-certificates
COPY --from=build /src/fabio /usr/bin
ADD fabio.properties /etc/fabio/fabio.properties
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-goreleaser
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.15
FROM alpine:3.16
RUN apk update && apk add --no-cache ca-certificates
COPY fabio /usr/bin
ADD fabio.properties /etc/fabio/fabio.properties
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ GOVERSION ?= $(shell go version | awk '{print $$3;}')
GORELEASER ?= $(shell which goreleaser)

# pin versions for CI builds
CI_CONSUL_VERSION ?= 1.8.4
CI_VAULT_VERSION ?= 1.5.2
CI_CONSUL_VERSION ?= 1.12.3
CI_VAULT_VERSION ?= 1.11.0
CI_HUGO_VERSION ?= 0.101.0

BETA_OSES = linux darwin
Expand Down
2 changes: 0 additions & 2 deletions admin/ui/assets/cdnjs.cloudflare.com/.gitignore

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions admin/ui/assets/code.jquery.com/.gitignore

This file was deleted.

2 changes: 2 additions & 0 deletions admin/ui/assets/code.jquery.com/jquery-3.6.0.min.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions admin/ui/assets/fonts/.gitignore

This file was deleted.

Binary file added admin/ui/assets/fonts/MaterialIcons-Regular.eot
Binary file not shown.
Binary file added admin/ui/assets/fonts/MaterialIcons-Regular.ttf
Binary file not shown.
Binary file added admin/ui/assets/fonts/MaterialIcons-Regular.woff
Binary file not shown.
Binary file added admin/ui/assets/fonts/MaterialIcons-Regular.woff2
Binary file not shown.
36 changes: 36 additions & 0 deletions admin/ui/assets/fonts/material-icons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
@font-face {
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
src: url(MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url(MaterialIcons-Regular.woff2) format('woff2'),
url(MaterialIcons-Regular.woff) format('woff'),
url(MaterialIcons-Regular.ttf) format('truetype');
}

.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 24px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
letter-spacing: normal;
word-wrap: normal;
white-space: nowrap;
direction: ltr;

/* Support for all WebKit browsers. */
-webkit-font-smoothing: antialiased;
/* Support for Safari and Chrome. */
text-rendering: optimizeLegibility;

/* Support for Firefox. */
-moz-osx-font-smoothing: grayscale;

/* Support for IE. */
font-feature-settings: 'liga';
}

0 comments on commit 2c072e7

Please sign in to comment.