Merge branch 'master' into develop

This commit is contained in:
Annika Hannig 2022-02-08 14:02:41 +01:00
commit fb630f3057
3 changed files with 14 additions and 2 deletions

View File

@ -37,10 +37,15 @@ jobs:
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Generate branch tag
id: set_tag
run: |
echo "::set-output name=tag::${{ github.ref_name }}-$(git rev-parse --short HEAD)-$(date +%s)"
- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
tags: ${{ steps.meta.outputs.tags }}, ${{ env.REGISTRY }}/${{env.IMAGE_NAME}}:${{ steps.set_tag.outputs.tag }}
labels: ${{ steps.meta.outputs.labels }}

View File

@ -40,6 +40,9 @@ WORKDIR /src/alice-lg/cmd/alice-lg
RUN make alpine
FROM alpine:latest
RUN apk add -U tzdata
COPY --from=backend /src/alice-lg/cmd/alice-lg/alice-lg-linux-amd64 /usr/bin/alice-lg
RUN ls -lsha /usr/bin/alice-lg

View File

@ -53,7 +53,11 @@ export const ColNetwork = function(props) {
// Special AS Path Widget
export const ColAsPath = function(props) {
const asns = _lookup(props.route, "bgp.as_path");
let asns = _lookup(props.route, "bgp.as_path");
if(!asns){
asns = [];
}
const baseUrl = "https://irrexplorer.nlnog.net/asn/AS"
let asnLinks = asns.map((asn, i) => {