Merge pull request #298 from sqlancer/docker-hub

mrigger · web-flow · commit d3bc04724eeb · 2021-01-24T10:35:46.000+01:00
Publish releases also at Docker Hub
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Publish package to the Maven Central Repository
+name: Publish package to the Maven Central Repository and Docker Hub
 on:
   release:
     types: [created]
@@ -21,3 +21,22 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build SQLancer
+        run: mvn -B package -DskipTests=true
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: mrigger/sqlancer
+          tag_with_ref: true
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:21.04
+
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install openjdk-15-jdk maven --yes --no-install-recommends
+
+# assumes that the project has already been built
+COPY target/sqlancer-*.jar sqlancer.jar
+COPY target/lib/*.jar /lib/
+
+ENTRYPOINT ["java", "-jar", "sqlancer.jar"]
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sqlancer</groupId>
   <artifactId>sqlancer</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.0</version>
   <name>SQLancer</name>
   <url>http://www.sqlancer.com/</url>
   <description>SQLancer finds logic bugs in Database Management Systems through automatic testing</description>
diff --git a/src/sqlancer/postgres/gen/PostgresTableGenerator.java b/src/sqlancer/postgres/gen/PostgresTableGenerator.java
@@ -198,6 +198,7 @@ private void generateInherits() {
             errors.add("cannot inherit from partitioned table");
             errors.add("has a collation conflict");
             errors.add("inherits conflicting default values");
+            errors.add("specifies generation expression");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ private void generateInherits() {`
`198`	`198`	`errors.add("cannot inherit from partitioned table");`
`199`	`199`	`errors.add("has a collation conflict");`
`200`	`200`	`errors.add("inherits conflicting default values");`
	`201`	`+ errors.add("specifies generation expression");`
`201`	`202`	`}`
`202`	`203`	`}`
`203`	`204`