Compare commits

..

6 Commits

Author SHA1 Message Date
Marcus Noble
75fe5da1d8 Remove link to create new issue 2020-12-13 17:24:29 +00:00
68a14fa619 Target arm arch 2020-09-12 13:59:50 +01:00
cf97345a0c Rename dockerfile 2020-09-12 11:42:14 +01:00
8a2944d59b Fix arm build make task 2020-09-12 11:24:17 +01:00
b7c5a18c12 Split out arm dockerfile 2020-09-12 10:17:19 +01:00
da48480ab8 Multi-arch builds 2020-09-11 22:32:36 +01:00
4 changed files with 34 additions and 15 deletions

View File

@@ -1,24 +1,17 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ubuntu:19.10 FROM ubuntu:19.10
ARG BUILDPLATFORM
ARG TARGETPLATFORM
ARG TARGETOS
ARG TARGETARCH
RUN apt-get update && apt-get install -y curl ca-certificates RUN apt-get update && apt-get install -y curl ca-certificates
RUN export URL="https://mega.nz/linux/MEGAsync/Raspbian_10.0/armhf/megacmd-Raspbian_10.0_armhf.deb" && \ RUN adduser --disabled-password --gecos '' mega && adduser mega sudo && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
if [ "${TARGETARCH}" = "amd64" ] ; then export URL="https://mega.nz/linux/MEGAsync/xUbuntu_19.10/amd64/megacmd-xUbuntu_19.10_amd64.deb" ; fi && \ RUN curl -k -o /megacmd.deb https://mega.nz/linux/MEGAsync/xUbuntu_19.10/amd64/megacmd-xUbuntu_19.10_amd64.deb
curl -k -o megacmd.deb $URL
RUN apt install -y ./megacmd.deb RUN apt install -y ./megacmd.deb
ADD entrypoint.sh / ADD entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
RUN adduser --disabled-password --gecos '' mega && adduser mega sudo && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER mega
WORKDIR /home/mega WORKDIR /home/mega
USER mega
ENV PASSWORD= ENV PASSWORD=
ENV EMAIL= ENV EMAIL=

18
Dockerfile.armhf Normal file
View File

@@ -0,0 +1,18 @@
FROM ubuntu:19.10
RUN apt-get update && apt-get install -y curl ca-certificates
RUN adduser --disabled-password --gecos '' mega && adduser mega sudo && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
RUN curl -k -o /megacmd.deb https://mega.nz/linux/MEGAsync/Raspbian_10.0/armhf/megacmd-Raspbian_10.0_armhf.deb
RUN apt install -y ./megacmd.deb
ADD entrypoint.sh /
RUN chmod +x /entrypoint.sh
WORKDIR /home/mega
USER mega
ENV PASSWORD=
ENV EMAIL=
CMD /entrypoint.sh

View File

@@ -1,7 +1,6 @@
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
IMAGE ?= docker.cluster.fun/averagemarcus/megasync:latest IMAGE ?= docker.cluster.fun/averagemarcus/megasync:latest
PLATFORMS ?= linux/amd64,linux/arm/v7
export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_CLI_EXPERIMENTAL=enabled
@@ -44,11 +43,20 @@ docker-build:
docker-publish: docker-publish:
@docker buildx create --use --name=crossplat --node=crossplat && \ @docker buildx create --use --name=crossplat --node=crossplat && \
docker buildx build \ docker buildx build \
--platform $(PLATFORMS) \
--output "type=image,push=true" \ --output "type=image,push=true" \
--tag $(IMAGE) \ --tag $(IMAGE) \
. .
.PHONY: docker-publish-arm # Build and push the armhf image (needs to be built on ARM hardware)
docker-publish-arm:
@docker buildx create --use --name=crossplat --node=crossplat && \
docker buildx build \
--file Dockerfile.armhf \
--platform linux/arm/7 \
--output "type=image,push=true" \
--tag $(IMAGE)-armhf \
.
.PHONY: run # Run the application .PHONY: run # Run the application
run: run:
@echo "⚠️ 'run' unimplemented" @echo "⚠️ 'run' unimplemented"

View File

@@ -37,7 +37,7 @@ make build
## Contributing ## Contributing
If you find a bug or have an idea for a new feature please [raise an issue](/AverageMarcus/megasync/issues/new) to discuss it. If you find a bug or have an idea for a new feature please raise an issue to discuss it.
Pull requests are welcomed but please try and follow similar code style as the rest of the project and ensure all tests and code checkers are passing. Pull requests are welcomed but please try and follow similar code style as the rest of the project and ensure all tests and code checkers are passing.