Update Dockerfile

Dockerfile

@@ -1,30 +1,50 @@
+# ベースイメージ
 FROM openjdk:11-jdk-slim
 
-RUN apt-get update && apt-get install -y git wget unzip && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV ANDROID_HOME=/sdk
-ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}"
-
-RUN mkdir -p $ANDROID_HOME/cmdline-tools && \
-    cd $ANDROID_HOME/cmdline-tools && \
-    wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O sdk-tools.zip && \
-    unzip sdk-tools.zip && \
-    rm sdk-tools.zip && \
-    mkdir latest && \
-    mv cmdline-tools/* latest/
-
-RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses && \
-    $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-33" "build-tools;33.0.2"
-
+# 作業ディレクトリ
 WORKDIR /app
-RUN git clone https://github.com/martykan/webTube.git
-WORKDIR /app/webTube
-
-# JitPackリポジトリを追加する設定
-RUN sed -i '/repositories {/a \    maven { url "https://jitpack.io" }' app/build.gradle
-RUN echo "sdk.dir=/sdk" > local.properties
 
+# 必要なツールとAndroid SDKのセットアップ
+RUN apt-get update && apt-get install -y \
+    wget \
+    unzip \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+# Android SDKのインストール
+ENV ANDROID_SDK_ROOT /sdk
+RUN mkdir -p /sdk && \
+    wget -q "https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" -O cmdline-tools.zip && \
+    unzip cmdline-tools.zip -d /sdk && \
+    rm cmdline-tools.zip && \
+    mkdir -p /sdk/cmdline-tools/latest && \
+    mv /sdk/cmdline-tools/* /sdk/cmdline-tools/latest && \
+    yes | /sdk/cmdline-tools/latest/bin/sdkmanager --licenses && \
+    /sdk/cmdline-tools/latest/bin/sdkmanager \
+    "platform-tools" \
+    "platforms;android-33" \
+    "build-tools;33.0.2"
+
+# 環境変数
+ENV PATH $PATH:/sdk/platform-tools:/sdk/build-tools/33.0.2
+
+# Gradleのインストール
+RUN wget -q "https://services.gradle.org/distributions/gradle-7.6-bin.zip" -O gradle.zip && \
+    unzip gradle.zip -d /opt/ && \
+    rm gradle.zip
+ENV PATH $PATH:/opt/gradle-7.6/bin
+
+# プロジェクトをコピー
+COPY . /app
+
+# NetCipherのクローンとビルド
+RUN git clone https://github.com/guardianproject/NetCipher.git /netcipher && \
+    cd /netcipher && \
+    ./gradlew build && \
+    mkdir -p /app/app/libs && \
+    cp /netcipher/netcipher/build/libs/netcipher.jar /app/app/libs/
+
+# 必要な依存関係をインストールしてビルド
 RUN ./gradlew clean build --refresh-dependencies --stacktrace
 
 CMD ["./gradlew", "run"]