Skip to content

Commit

Permalink
Merge pull request #1 from ericpp/master
Browse files Browse the repository at this point in the history
Switch to docker image and manifest updates
  • Loading branch information
daveajones authored Sep 29, 2023
2 parents 9927ca0 + f424cf8 commit 62472f1
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 52 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

36 changes: 5 additions & 31 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,42 +1,16 @@
##: Build stage
FROM rust:latest AS builder

# arm64 or amd64
ARG PLATFORM

USER root

RUN apt-get update
RUN apt-get install -y apt-utils sqlite3 openssl

COPY helipad /opt/helipad

WORKDIR /opt/helipad
RUN cargo build --release
RUN cp target/release/helipad .

##: Bundle stage
FROM debian:buster-slim AS runner
# sha256 from: docker buildx imagetools inspect <image>
FROM podcastindexorg/podcasting20-helipad@sha256:6767de3126b0a7d317f7c87766a1f063baa44fb85dc5496c794ff9aff306a4c1

ARG ARCH
ARG PLATFORM

USER root

RUN apt-get update && apt-get install -y apt-utils ca-certificates openssl sqlite3 tini
RUN apt-get update && \
apt-get install -y tini && \
rm -fr /var/lib/apt/lists/*

COPY ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
RUN chmod +x /usr/local/bin/*.sh

RUN mkdir /opt/helipad

WORKDIR /opt/helipad
COPY --from=builder /opt/helipad/target/release/helipad .
COPY --from=builder /opt/helipad/webroot ./webroot
COPY --from=builder /opt/helipad/helipad.conf .

RUN useradd -u 1000 helipad

EXPOSE 2112/tcp

ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]
1 change: 0 additions & 1 deletion helipad
Submodule helipad deleted from 1e8fa8
10 changes: 3 additions & 7 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
id: helipad
title: "Helipad"
version: 0.1.10
version: 0.1.10.5
release-notes: |
* v0.1.10 - Elements of style... (v0.1.10) [Release Notes](https://github.com/Podcastindex-org/helipad/releases/tag/v0.1.10)
license: mit
wrapper-repo: "https://github.com/ericpp/helipad-startos"
wrapper-repo: "https://github.com/Podcastindex-org/helipad-startos"
upstream-repo: "https://github.com/Podcastindex-org/helipad"
support-site: "https://podcastindex.social"
marketing-site: "https://podcastindex.org"
Expand All @@ -31,11 +31,7 @@ health-checks:
name: Web Interface
success-message: Helipad is ready to visit in a web browser
type: script
config:
get:
type: script
set:
type: script
config: ~
properties:
type: script
volumes:
Expand Down
3 changes: 1 addition & 2 deletions scripts/embassy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export { setConfig } from "./services/setConfig.ts";
export { properties } from "./services/properties.ts";
export { getConfig } from "./services/getConfig.ts";
export { health } from "./services/healthChecks.ts";
export { migration } from "./services/migrations.ts";
5 changes: 0 additions & 5 deletions scripts/services/getConfig.ts

This file was deleted.

5 changes: 5 additions & 0 deletions scripts/services/migrations.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { compat, types as T } from "../deps.ts";

export const migration: T.ExpectedExports.migration =
compat.migrations.fromMapping({}, "0.1.10.4");

3 changes: 0 additions & 3 deletions scripts/services/setConfig.ts

This file was deleted.

0 comments on commit 62472f1

Please sign in to comment.