Skip to content

Commit

Permalink
Merge pull request #21 from AgPipeline/develop
Browse files Browse the repository at this point in the history
Merge develop into main branch - no review
  • Loading branch information
Chris-Schnaufer authored Nov 2, 2020
2 parents 8cc9d8e + 3edd438 commit 32dc1f4
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/action_pylint.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
cp ./.github/workflows/*.py ./


1 change: 1 addition & 0 deletions .github/workflows/pylint_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- develop
tags:
- v*
workflow_dispatch:

jobs:
update_python:
Expand Down
48 changes: 48 additions & 0 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,54 @@
FROM base-image
LABEL maintainer=""

# Add user
RUN useradd -u 49044 extractor \
&& mkdir /home/extractor
RUN chown -R extractor /home/extractor \
&& chgrp -R extractor /home/extractor

# Install the Python version we want
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
python3.7 \
python3-pip && \
ln -sfn /usr/bin/python3.7 /usr/bin/python && \
ln -sfn /usr/bin/python3.7 /usr/bin/python3 && \
ln -sfn /usr/bin/python3.7m /usr/bin/python3m && \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Perform some upgrades
RUN python3 -m pip install --upgrade --no-cache-dir pip
RUN python3 -m pip install --upgrade --no-cache-dir setuptools

# Install applications we need
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3-gdal \
gdal-bin \
libgdal-dev \
gcc \
g++ \
python3.7-dev && \
python3 -m pip install --upgrade --no-cache-dir \
wheel && \
python3 -m pip install --upgrade --no-cache-dir \
numpy && \
python3 -m pip install --upgrade --no-cache-dir \
pygdal==2.2.3.* && \
apt-get remove -y \
libgdal-dev \
gcc \
g++ \
python3-dev && \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Install the requirements we need for this Transformer
COPY requirements.txt packages.txt /home/extractor/

USER root
Expand Down
2 changes: 1 addition & 1 deletion generate_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
DOCKERFILE_TEMPLATE_FILE_NAMES = ["Dockerfile.template"]

# The default docker image to use
DEFAULT_DOCKER_IMAGE = 'agdrone/agpypeline:1.0'
DEFAULT_DOCKER_IMAGE = 'ubuntu:18.04'

def determine_base_image() -> str:
"""Determines the base image to use in the dockerfile
Expand Down
1 change: 0 additions & 1 deletion packages.txt
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
python3-wheel
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
agpypeline==0.0.20
agpypeline

0 comments on commit 32dc1f4

Please sign in to comment.