Skip to content

Commit

Permalink
Rejigged naming
Browse files Browse the repository at this point in the history
  • Loading branch information
ud3sh committed Oct 2, 2023
1 parent 0f284e1 commit ac4dfd0
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 10 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'main'
- 'docker-devenv-9'
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -27,4 +28,12 @@ jobs:
context: .
file: ./Dockerfile
push: true
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/devenv:latest
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/devenv:latest
-
name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile-lite
push: true
tags: ${{ secrets.DOCKER_HUB_USERNAME }}/devenv-lite:latest
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM node:19-alpine3.16
FROM sitespeedio/node:ubuntu-22.04-nodejs-18.16.0
ARG WORKSPACE_DIR=/evidence-workspace

RUN apk add --no-cache bash curl wget nano git && \
apk add xdg-utils && \
RUN apt-get update && apt-get install -y \
curl wget nano git xdg-utils && \
npm install -g degit && \
mkdir -p ${WORKSPACE_DIR} && \
mkdir -p /evidence-bin
mkdir -p /evidence-bin && \
rm -rf /var/lib/apt/lists/*

COPY bootstrap.sh /evidence-bin/bootstrap.sh
WORKDIR ${WORKSPACE_DIR}
Expand Down
9 changes: 4 additions & 5 deletions Dockerfile-duckdb → Dockerfile-lite
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
FROM sitespeedio/node:ubuntu-22.04-nodejs-18.16.0
FROM node:18-alpine3.16
ARG WORKSPACE_DIR=/evidence-workspace

RUN apt-get update && apt-get install -y \
curl wget nano git xdg-utils && \
RUN apk add --no-cache bash curl wget nano git && \
apk add xdg-utils && \
npm install -g degit && \
mkdir -p ${WORKSPACE_DIR} && \
mkdir -p /evidence-bin && \
rm -rf /var/lib/apt/lists/*
mkdir -p /evidence-bin

COPY bootstrap.sh /evidence-bin/bootstrap.sh
WORKDIR ${WORKSPACE_DIR}
Expand Down

0 comments on commit ac4dfd0

Please sign in to comment.