Skip to content

Commit

Permalink
Merge pull request #1 from Indicio-tech/chore/updates
Browse files Browse the repository at this point in the history
chore: updates
  • Loading branch information
dbluhm authored Jan 11, 2024
2 parents 02351dd + 521f45f commit ff1b55a
Show file tree
Hide file tree
Showing 5 changed files with 1,203 additions and 903 deletions.
60 changes: 60 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Publish Image

on:
release:
types: [published]

# Ensure only the most recent workflow runs.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
publish_to_ghcr:
name: Publish image to ghcr.io
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3

- name: Lowercase repo owner
id: lowercase_repo_owner
uses: ASzc/change-string-case-action@v1
with:
string: ${{ github.repository_owner }}

- name: Setup Image Metadata
id: meta
uses: docker/metadata-action@v3
with:
# list of Docker images to use as base name for tags
images: |
ghcr.io/${{ steps.lowercase_repo_owner.outputs.lowercase }}/agent-tunnel
# generate Docker tags based on the following events/attributes
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Log in to the GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build and Push to Docker ghcr.io
uses: docker/build-push-action@v2
with:
push: true
file: Dockerfile
context: .
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM node:17.0.1-alpine3.14 AS base
FROM node:20.10.0-bullseye-slim AS base
WORKDIR /app
RUN apk update && apk add yarn
RUN apt-get update && apt-get install -y yarn && apt-get clean
COPY package.json ./
COPY yarn.lock ./
ENV NODE_ENV production
RUN yarn install --production=true

FROM node:17.0.1-alpine3.14
FROM node:20.10.0-bullseye-slim
LABEL author="Daniel Bluhm <[email protected]>"
LABEL description="Wrapper around localtunnel providing URL retrieval over HTTP"
WORKDIR /app

COPY --from=base /app/node_modules /app/node_modules
RUN apk update --no-cache && apk add dumb-init
RUN apt-get update && apt-get install dumb-init
USER node
COPY wait.sh /wait.sh
COPY --chown=node:node index.js ./
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const express = require('express')
const localtunnel = require('localtunnel')
const localtunnel = require('@security-patched/localtunnel')
const morgan = require('morgan')
const { exit } = require('yargs')
const yargs = require('yargs')
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"author": "Daniel Bluhm <[email protected]>",
"license": "MIT",
"dependencies": {
"@security-patched/localtunnel": "^2.0.2-secpatched.3",
"express": "^4.17.1",
"localtunnel": "^2.0.2",
"morgan": "^1.10.0",
"yargs": "^17.1.0"
},
"devDependencies": {
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0",
"@commitlint/cli": "^18.4.4",
"@commitlint/config-conventional": "^18.4.4",
"eslint": "^7.32.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.25.2",
Expand All @@ -22,7 +22,8 @@
"husky": "^7.0.0"
},
"scripts": {
"prepare": "husky install"
"prepare": "husky install",
"start": "node index.js"
},
"husky": {
"hooks": {
Expand Down
Loading

0 comments on commit ff1b55a

Please sign in to comment.